Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | initialise jot editor if it is used as a file drop target and isn't yet opened. | redmatrix | 2016-08-10 | 1 | -1/+6 | |
| | | ||||||
| * | update CHANGELOG for 1.12 | redmatrix | 2016-08-10 | 1 | -0/+25 | |
| | | ||||||
| * | new version | redmatrix | 2016-08-10 | 1 | -1/+1 | |
| | | ||||||
| * | implement acl for folder creation | Mario Vavti | 2016-08-10 | 4 | -17/+53 | |
| | | ||||||
* | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-10 | 70 | -2514/+2837 | |
|\| | ||||||
| * | 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 | |
| | | ||||||
| * | function order reversed | redmatrix | 2016-08-09 | 1 | -2/+2 | |
| | | ||||||
| * | 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) | |||||
| * | bad code format | redmatrix | 2016-08-09 | 2 | -2/+27 | |
| | | ||||||
| * | updates to hcard parsing | redmatrix | 2016-08-07 | 1 | -4/+9 | |
| | | ||||||
| * | diaspora vcard updates | redmatrix | 2016-08-07 | 2 | -5/+12 | |
| | | ||||||
| * | server roles | redmatrix | 2016-08-07 | 1 | -6/+8 | |
| | | ||||||
| * | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 24 | -71/+135 | |
| | | ||||||
| * | fix cloud path | redmatrix | 2016-08-07 | 1 | -1/+1 | |
| | | ||||||
| * | fix /cloud upload for images | Mario Vavti | 2016-08-06 | 1 | -1/+1 | |
| | | ||||||
| * | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 4 | -19/+31 | |
| | | ||||||
| * | strings update | redmatrix | 2016-08-05 | 1 | -2270/+2333 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-05 | 38 | -121/+242 | |
| |\ | ||||||
| | * | Merge pull request #477 from git-marijus/dev | hubzilla | 2016-08-06 | 37 | -119/+200 | |
| | |\ | | | | | | | | | Some work to make multiple acl forms per page work | |||||
| | | * | 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 | 3 | -5/+7 | |
| | | | | ||||||
| | | * | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 | |
| | | | | ||||||
| | | * | multi acl: port /thing | Mario Vavti | 2016-08-05 | 4 | -7/+13 | |
| | | | | ||||||
| | | * | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 8 | -20/+18 | |
| | | | | ||||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 2 | -2/+42 | |
| | | |\ | | | |/ | | |/| | ||||||
| | * | | Merge pull request #476 from anaqreon/wiki | hubzilla | 2016-08-05 | 2 | -2/+42 | |
| | |\ \ | | | | | | | | | | | Wiki bbcode parsing | |||||
| | | * \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-08-04 | 1 | -11/+13 | |
| | | |\ \ | | | |/ / | | |/| | | ||||||
| | | * | | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 2 | -2/+8 | |
| | | | | | ||||||
| | | * | | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 2 | -0/+34 | |
| | | | | | ||||||
| | | | * | 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 | 2 | -11/+20 | |
| | | | | | ||||||
| | | | * | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 4 | -3/+13 | |
| | | | | | ||||||
| | | | * | multi acl: port /chat | Mario Vavti | 2016-08-04 | 2 | -1/+5 | |
| | | | | | ||||||
| | | | * | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 6 | -27/+14 | |
| | | | | | ||||||
| | | | * | multi acl: port photos | Mario Vavti | 2016-08-04 | 3 | -8/+13 | |
| | | | | | ||||||
| | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 2 | -12/+14 | |
| | | | |\ | | | |_|/ | | |/| | | ||||||
| | | | * | multi acl: port events | Mario Vavti | 2016-08-03 | 5 | -10/+20 | |
| | | | | | ||||||
| | | | * | 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 | 37 | -3237/+4429 | |
| | | | |\ | ||||||
| | | | * | | multiple acl work | Mario Vavti | 2016-08-03 | 11 | -43/+96 | |
| | | | | | | ||||||
| * | | | | | minor cleanup on ratings - no real functional changes at this time | redmatrix | 2016-08-04 | 2 | -12/+20 | |
| |/ / / / | ||||||
* | | | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-05 | 8 | -18/+158 | |
|\| | | | | ||||||
| * | | | | issue #474 | redmatrix | 2016-08-03 | 1 | -11/+13 | |
| |/ / / | ||||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-03 | 4 | -4/+142 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | 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.) | |||||
| * | | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 | |
| |/ / |