Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | doco updates | redmatrix | 2016-08-22 | 4 | -2/+155 | |
| | | | ||||||
| * | | server role management, part 1 | redmatrix | 2016-08-22 | 3 | -12/+37 | |
| | | | ||||||
| * | | remove references to tinymce which were causing console errors | redmatrix | 2016-08-21 | 2 | -85/+4 | |
| | | | ||||||
| * | | make zid() do the right things when confronted with url fragments | redmatrix | 2016-08-21 | 1 | -0/+10 | |
| | | | ||||||
| * | | Merge branch 'git-marijus-dev' into dev | redmatrix | 2016-08-21 | 10 | -103/+125 | |
| |\ \ | ||||||
| | * | | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into ↵ | redmatrix | 2016-08-21 | 10 | -103/+125 | |
| |/| | | | | | | | | | | | | | | git-marijus-dev | |||||
| | * | | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 10 | -103/+124 | |
| | | | | ||||||
| * | | | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 | |
| | | | | ||||||
| * | | | Merge branch 'zp' into dev | redmatrix | 2016-08-19 | 1 | -4/+31 | |
| |\ \ \ | ||||||
| | * | | | block backdoor delivery of bulk imported items | redmatrix | 2016-08-19 | 1 | -4/+31 | |
| | |/ / | ||||||
| * / / | string update | redmatrix | 2016-08-19 | 1 | -3697/+3724 | |
| |/ / | ||||||
* | | | Website export to cloud files works. Created new recursive copy function in ↵ | Andrew Manning | 2016-08-23 | 4 | -9/+113 | |
| | | | | | | | | | | | | attach.php. | |||||
* | | | Visual improvements to the export element table | Andrew Manning | 2016-08-21 | 1 | -25/+25 | |
| | | | ||||||
* | | | Block export and re-import works. Fixed bug where layout content was not ↵ | Andrew Manning | 2016-08-20 | 3 | -3/+157 | |
| | | | | | | | | | | | | being imported properly. | |||||
* | | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 3 | -16/+137 | |
| | | | ||||||
* | | | Export of pages and their layouts to a zip file works. Bug on importing the ↵ | Andrew Manning | 2016-08-20 | 5 | -10/+242 | |
| | | | | | | | | | | | | exported zip file for pages. | |||||
* | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 11 | -6150/+6138 | |
|\| | | ||||||
| * | | remove insecure repository warning. | redmatrix | 2016-08-18 | 4 | -31/+31 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-17 | 2 | -6106/+6089 | |
| |\ \ | ||||||
| | * | | Merge pull request #492 from wave72/dev | hubzilla | 2016-08-17 | 2 | -6106/+6089 | |
| | |\| | | | | | | | | | Updated Italian strings | |||||
| | | * | Updated Italian strings | Wave72 | 2016-08-17 | 2 | -6106/+6089 | |
| | |/ | ||||||
| * / | import anomaly | redmatrix | 2016-08-17 | 1 | -4/+6 | |
| |/ | ||||||
| * | don't set session theme unless logged in. | redmatrix | 2016-08-16 | 3 | -1/+11 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-16 | 4 | -43/+30 | |
| |\ | ||||||
| * | | get rid of ugly code construct | redmatrix | 2016-08-16 | 1 | -8/+1 | |
| | | | ||||||
* | | | Pages populate the available-to-export list. New checkbox class for smaller ↵ | Andrew Manning | 2016-08-19 | 4 | -10/+182 | |
| | | | | | | | | | | | | boxes. | |||||
* | | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 7 | -64/+80 | |
| | | | ||||||
* | | | Stash changes for merge with dev | Andrew Manning | 2016-08-17 | 4 | -0/+52 | |
| |/ |/| | ||||||
* | | Merge pull request #491 from mjfriaza/dev | hubzilla | 2016-08-17 | 1 | -0/+12 | |
|\ \ | | | | | | | Add Spanish context help settings/features page | |||||
| * | | Add Spanish context help settings/features page | Manuel Jiménez Friaza | 2016-08-16 | 1 | -0/+12 | |
|/ / | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 5 | -35/+83 | |
|\| | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 1 | -14/+1 | |
| |\ | ||||||
| * | | move schema settings into the display settings main so we can set ↵ | redmatrix | 2016-08-15 | 5 | -35/+83 | |
| | | | | | | | | | | | | theme:schema theme selectors in settings | |||||
* | | | rename limited -> custom | Mario Vavti | 2016-08-16 | 3 | -17/+17 | |
| | | | ||||||
* | | | remove unneeded function | Mario Vavti | 2016-08-16 | 1 | -26/+1 | |
| |/ |/| | ||||||
* | | only check settings-form for dirty state and remove redundant javascript | Mario Vavti | 2016-08-16 | 1 | -14/+1 | |
|/ | ||||||
* | Use double quotes for strings passed via templates to javascript. Some ↵ | redmatrix | 2016-08-15 | 1 | -5/+5 | |
| | | | | translated strings have unescaped single quotes. | |||||
* | Merge pull request #487 from git-marijus/dev | hubzilla | 2016-08-16 | 3 | -128/+79 | |
|\ | | | | | implement groups in the acl select. | |||||
| * | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 3 | -124/+30 | |
| | | ||||||
| * | implement groups in the acl select. please notice that selecting *custom ↵ | Mario Vavti | 2016-08-15 | 1 | -17/+62 | |
| | | | | | | | | selection* now sets an empty (public) acl. it was set to self before... | |||||
* | | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 3 | -134/+140 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 2 | -47/+7 | |
|\ \ | ||||||
| * \ | Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev | hubzilla | 2016-08-16 | 2 | -47/+7 | |
| |\ \ | | |/ | |/| | Merge dev with last changes of homeinstall script in master | |||||
| | * | Merge dev with last changes of homeinstall script in master | Einer von Vielen | 2016-08-15 | 2 | -47/+7 | |
| |/ | ||||||
* | | s/$rr/$rv/ | redmatrix | 2016-08-14 | 1 | -22/+22 | |
| | | ||||||
* | | event_store_event hook | redmatrix | 2016-08-14 | 3 | -0/+21 | |
|/ | ||||||
* | Merge pull request #484 from anaqreon/settings-context | hubzilla | 2016-08-15 | 2 | -1/+13 | |
|\ | | | | | Context help for settings/features page | |||||
| * | Context help for settings/features page | Andrew Manning | 2016-08-14 | 2 | -1/+13 | |
|/ | ||||||
* | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 5 | -0/+35 | |
|\ | | | | | Added an optional post editor button to toggle comments | |||||
| * | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 2 | -1/+2 | |
| | |