| Commit message (Expand) | Author | Age | Files | Lines |
* | move schema settings into the display settings main so we can set theme:schem... | redmatrix | 2016-08-15 | 3 | -18/+24 |
* | 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 |
* | 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 |
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 10 | -20/+74 |
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 2 | -17/+28 |
* | Revert "Revert "remove some logging"" | Mario Vavti | 2016-08-05 | 1 | -10/+1 |
* | Revert "remove some logging" | Mario Vavti | 2016-08-05 | 1 | -1/+10 |
* | remove some logging | Mario Vavti | 2016-08-05 | 1 | -10/+1 |
* | multi acl: port /settings | Mario Vavti | 2016-08-05 | 2 | -4/+2 |
* | multi acl: port /thing | Mario Vavti | 2016-08-05 | 3 | -7/+5 |
* | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 6 | -15/+13 |
* | multi acl: provide a acl-form-trigger class which comes handy in certain situ... | Mario Vavti | 2016-08-04 | 3 | -6/+7 |
* | 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 | 4 | -21/+5 |
* | 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 | 3 | -7/+9 |
* | | multiple acl: store new data in update_view() | Mario Vavti | 2016-08-03 | 1 | -19/+23 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 11 | -11/+445 |
|\| |
|
| * | belongs to previous commit | jeroenpraat | 2016-08-03 | 1 | -0/+1 |
| * | Improved a few schemas - context help fix - dark schemas now have dark text a... | jeroenpraat | 2016-08-03 | 4 | -4/+141 |
| * | 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 | 3 | -72/+216 |
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 12 | -10198/+10982 |
| |\ |
|
| * \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 1 | -1/+1 |
| |\ \ |
|
| * | | | 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 | 4 | -20/+47 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 15 | -558/+102 |
| |\ \ \ \ |
|
| * | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+6 |