| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-30 | 6 | -6175/+6206 |
|\ |
|
| * | Merge pull request #505 from wave72/dev | Wave | 2016-08-30 | 2 | -6166/+6197 |
| |\ |
|
| | * | Updated Italian strings | Wave72 | 2016-08-30 | 2 | -6166/+6197 |
| * | | make lock switching actually work with multiple acl forms | Mario Vavti | 2016-08-29 | 2 | -7/+6 |
| * | | move allowed email domains to admin->security page | redmatrix | 2016-08-28 | 2 | -2/+3 |
* | | | Merge remote-tracking branch 'upstream/dev' into website-export. Added attach... | Andrew Manning | 2016-08-27 | 4 | -24/+53 |
|\| | |
|
| * | | contact-block needs a class clear div at the end to not mess with following w... | Mario Vavti | 2016-08-26 | 1 | -11/+12 |
| * | | off by one pixel | redmatrix | 2016-08-24 | 1 | -3/+3 |
| * | | do not return false since it could prevent clicking also when not appropriate. | Mario Vavti | 2016-08-24 | 1 | -1/+1 |
| * | | remove the onclick action | Mario Vavti | 2016-08-24 | 1 | -1/+1 |
| * | | do not remove cover photo after scrolling it up. mimik an scroll edge if scro... | Mario Vavti | 2016-08-24 | 1 | -24/+39 |
| * | | Revert "revert cover photo changes" | Mario Vavti | 2016-08-24 | 1 | -8/+20 |
| * | | revert cover photo changes | redmatrix | 2016-08-24 | 1 | -20/+8 |
| * | | allow changing the server role - as well as configuring any of the three opti... | redmatrix | 2016-08-23 | 2 | -1/+2 |
| * | | cover photo: adjustments to display the entire photo on manual scrollback (pa... | redmatrix | 2016-08-23 | 1 | -1/+2 |
| * | | several cover photo widget enhancements: | redmatrix | 2016-08-23 | 1 | -8/+19 |
* | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-23 | 7 | -174/+114 |
|\| | |
|
| * | | optional server role compatibility checks for plugins | redmatrix | 2016-08-22 | 1 | -0/+3 |
| * | | remove references to tinymce which were causing console errors | redmatrix | 2016-08-21 | 2 | -85/+4 |
| * | | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 4 | -89/+107 |
| |/ |
|
* | | Website export to cloud files works. Created new recursive copy function in a... | Andrew Manning | 2016-08-23 | 1 | -1/+15 |
* | | 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 bein... | Andrew Manning | 2016-08-20 | 1 | -0/+36 |
* | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 1 | -0/+35 |
* | | Export of pages and their layouts to a zip file works. Bug on importing the e... | Andrew Manning | 2016-08-20 | 2 | -3/+5 |
* | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 2 | -6106/+6089 |
|\| |
|
| * | Updated Italian strings | Wave72 | 2016-08-17 | 2 | -6106/+6089 |
* | | Pages populate the available-to-export list. New checkbox class for smaller b... | Andrew Manning | 2016-08-19 | 2 | -6/+110 |
* | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 4 | -20/+47 |
* | | Stash changes for merge with dev | Andrew Manning | 2016-08-17 | 2 | -0/+15 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 3 | -18/+24 |
|\ |
|
| * | 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 theme:schem... | redmatrix | 2016-08-15 | 3 | -18/+24 |
* | | | rename limited -> custom | Mario Vavti | 2016-08-16 | 2 | -16/+16 |
* | | | 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 transl... | redmatrix | 2016-08-15 | 1 | -5/+5 |
* | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 2 | -17/+18 |
* | implement groups in the acl select. please notice that selecting *custom sele... | Mario Vavti | 2016-08-15 | 1 | -17/+62 |
* | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 2 | -0/+22 |
|\ |
|
| * | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 1 | -1/+1 |
| * | Replace hardcoded button title in javascript to translatable text | Andrew Manning | 2016-08-14 | 1 | -2/+2 |
| * | Added a disable comments setting to the "Additional features" settings with a... | Andrew Manning | 2016-08-14 | 2 | -0/+22 |
* | | fix javascript error if not logged in | Mario Vavti | 2016-08-14 | 1 | -2/+2 |
|/ |
|
* | btn/dropdown rendering issue | Mario Vavti | 2016-08-14 | 1 | -24/+30 |
* | remove js debugging | Mario Vavti | 2016-08-13 | 1 | -1/+0 |
* | fix #480, enable bbcode autocomplete for photo comments and remove some redun... | Mario Vavti | 2016-08-13 | 4 | -16/+3 |
* | possible quickfix for multi-acl not honoring jotnets | Mario Vavti | 2016-08-12 | 1 | -0/+6 |
* | initialise jot editor if it is used as a file drop target and isn't yet opened. | redmatrix | 2016-08-10 | 1 | -1/+6 |
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 1 | -7/+19 |