Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Andrew Manning | 2016-08-19 | 2 | -6/+110 |
| | | | | | | | | boxes. | ||||
* | | 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 ↵ | redmatrix | 2016-08-15 | 3 | -18/+24 |
| | | | | | | | | | | | | theme:schema theme selectors in settings | ||||
* | | | 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 ↵ | redmatrix | 2016-08-15 | 1 | -5/+5 |
| | | | | translated strings have unescaped single quotes. | ||||
* | 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 ↵ | Mario Vavti | 2016-08-15 | 1 | -17/+62 |
| | | | | selection* now sets an empty (public) acl. it was set to self before... | ||||
* | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 2 | -0/+22 |
|\ | | | | | 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 | 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 ↵ | Andrew Manning | 2016-08-14 | 2 | -0/+22 |
| | | | | | | | | a corresponding post editor toggle button | ||||
* | | 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 ↵ | Mario Vavti | 2016-08-13 | 4 | -16/+3 |
| | | | | redundant javascript | ||||
* | 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 ↵ | redmatrix | 2016-08-10 | 1 | -4/+18 |
| | | | | probably also need this for filedropping. | ||||
* | 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 ↵ | redmatrix | 2016-08-09 | 2 | -2/+2 |
| | | | | well as files (which will be uploaded) | ||||
* | 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 |
| | | | | This reverts commit e67f5bc6bbb77d53867d7c03bda8410c59360dbe. | ||||
* | Revert "remove some logging" | Mario Vavti | 2016-08-05 | 1 | -1/+10 |
| | | | | This reverts commit 316b090433b7e415fd3c8ac6230f2df0277cdf8c. | ||||
* | 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 ↵ | Mario Vavti | 2016-08-04 | 3 | -6/+7 |
| | | | | situations | ||||
* | 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 ↵ | jeroenpraat | 2016-08-03 | 4 | -4/+141 |
| | | | | | | | | areas (et al.) |