| Commit message (Expand) | Author | Age | Files | Lines |
* | Stash changes for merge with dev | Andrew Manning | 2016-08-17 | 1 | -0/+14 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 1 | -0/+3 |
|\ |
|
| * | move schema settings into the display settings main so we can set theme:schem... | redmatrix | 2016-08-15 | 1 | -0/+3 |
* | | rename limited -> custom | Mario Vavti | 2016-08-16 | 1 | -1/+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 | 1 | -0/+1 |
* | 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 |
* | fix #480, enable bbcode autocomplete for photo comments and remove some redun... | Mario Vavti | 2016-08-13 | 2 | -1/+1 |
* | 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 |
* | open editor or comment window when linkdropping to a closed window. We probab... | redmatrix | 2016-08-10 | 1 | -4/+18 |
* | allow dropping links on comments as well as posts | redmatrix | 2016-08-09 | 2 | -2/+4 |
* | You can drag links to the editor (which will be parsed and inserted); as well... | redmatrix | 2016-08-09 | 2 | -2/+2 |
* | diaspora vcard updates | redmatrix | 2016-08-07 | 1 | -5/+11 |
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 1 | -15/+26 |
* | multi acl: port /settings | Mario Vavti | 2016-08-05 | 1 | -2/+2 |
* | multi acl: port /thing | Mario Vavti | 2016-08-05 | 2 | -6/+4 |
* | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 4 | -4/+4 |
* | multi acl: provide a acl-form-trigger class which comes handy in certain situ... | Mario Vavti | 2016-08-04 | 2 | -2/+2 |
* | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 1 | -7/+7 |
* | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 1 | -2/+2 |
* | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
* | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 2 | -5/+4 |
* | multi acl: port photos | Mario Vavti | 2016-08-04 | 2 | -7/+4 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 1 | -11/+13 |
|\ |
|
| * | issue #474 | redmatrix | 2016-08-03 | 1 | -11/+13 |
* | | multi acl: port events | Mario Vavti | 2016-08-03 | 2 | -4/+7 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 4 | -7/+202 |
|\| |
|
| * | allow individual permissions on atokens | redmatrix | 2016-07-31 | 2 | -7/+39 |
| * | Remove scanned element column for existing element information which we are n... | Andrew Manning | 2016-07-31 | 1 | -3/+9 |
| * | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 2 | -28/+36 |
| * | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 1 | -72/+116 |
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 3 | -18/+100 |
| |\ |
|
| * | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 2 | -0/+78 |
| * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 2 | -19/+28 |
| |\ \ |
|
| * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 3 | -5/+49 |
| |\ \ \ |
|
| * | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+6 |
| * | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -3/+14 |
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 5 | -10/+10 |
| |\ \ \ \ |
|
| * | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab.... | Andrew Manning | 2016-07-12 | 1 | -2/+2 |
| * | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -6/+22 |
| * | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 1 | -0/+7 |
* | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 5 | -15/+15 |
| |_|_|_|/
|/| | | | |
|
* | | | | | catch all input fields (in preparation for acl in this place) and display the... | Mario Vavti | 2016-07-29 | 1 | -0/+2 |
* | | | | | Fixed bug where multiple post attachements by drag-and-drop were not being ad... | Andrew Manning | 2016-07-28 | 1 | -3/+3 |