Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-23 | 7 | -7/+15 |
|\ | |||||
| * | optional server role compatibility checks for plugins | redmatrix | 2016-08-22 | 1 | -0/+1 |
| | | |||||
| * | server role management, part 1 | redmatrix | 2016-08-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into ↵ | redmatrix | 2016-08-21 | 4 | -5/+10 |
| |\ | | | | | | | | | | git-marijus-dev | ||||
| | * | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 4 | -5/+9 |
| | | | |||||
| * | | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 |
| |/ | |||||
* | | Website export to cloud files works. Created new recursive copy function in ↵ | Andrew Manning | 2016-08-23 | 1 | -8/+47 |
| | | | | | | | | attach.php. | ||||
* | | Block export and re-import works. Fixed bug where layout content was not ↵ | Andrew Manning | 2016-08-20 | 1 | -1/+68 |
| | | | | | | | | being imported properly. | ||||
* | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 1 | -14/+56 |
| | | |||||
* | | Export of pages and their layouts to a zip file works. Bug on importing the ↵ | Andrew Manning | 2016-08-20 | 1 | -6/+136 |
| | | | | | | | | exported zip file for pages. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 1 | -1/+1 |
|\| | |||||
| * | remove insecure repository warning. | redmatrix | 2016-08-18 | 1 | -1/+1 |
| | | |||||
* | | Pages populate the available-to-export list. New checkbox class for smaller ↵ | Andrew Manning | 2016-08-19 | 1 | -4/+10 |
| | | | | | | | | boxes. | ||||
* | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 1 | -2/+24 |
|/ | |||||
* | move schema settings into the display settings main so we can set ↵ | redmatrix | 2016-08-15 | 1 | -16/+58 |
| | | | | theme:schema theme selectors in settings | ||||
* | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 1 | -134/+2 |
| | |||||
* | Added a disable comments setting to the "Additional features" settings with ↵ | Andrew Manning | 2016-08-14 | 1 | -0/+2 |
| | | | | a corresponding post editor toggle button | ||||
* | string update | redmatrix | 2016-08-12 | 1 | -1/+1 |
| | |||||
* | fix auto-connect setting | zottel | 2016-08-12 | 1 | -3/+0 |
| | |||||
* | more cleanup of api | redmatrix | 2016-08-11 | 1 | -1/+1 |
| | |||||
* | A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but ↵ | redmatrix | 2016-08-11 | 1 | -32/+23 |
| | | | | you have to start somewhere. | ||||
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 1 | -9/+14 |
| | |||||
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 2 | -16/+19 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-05 | 14 | -18/+79 |
|\ | |||||
| * | multi acl: port /settings | Mario Vavti | 2016-08-05 | 1 | -1/+5 |
| | | |||||
| * | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 |
| | | |||||
| * | multi acl: port /thing | Mario Vavti | 2016-08-05 | 1 | -0/+8 |
| | | |||||
| * | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 2 | -5/+5 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 1 | -2/+3 |
| |\ | |||||
| | * | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 1 | -2/+2 |
| | | | |||||
| | * | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 1 | -0/+1 |
| | | | |||||
| * | | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 1 | -4/+13 |
| | | | |||||
| * | | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 3 | -1/+11 |
| | | | |||||
| * | | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -0/+4 |
| | | | |||||
| * | | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 1 | -6/+5 |
| | | | |||||
| * | | multi acl: port photos | Mario Vavti | 2016-08-04 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
| |\| | |||||
| * | | multi acl: port events | Mario Vavti | 2016-08-03 | 1 | -1/+11 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 6 | -14/+261 |
| |\ \ | |||||
| * | | | multiple acl work | Mario Vavti | 2016-08-03 | 3 | -2/+9 |
| | | | | |||||
* | | | | minor cleanup on ratings - no real functional changes at this time | redmatrix | 2016-08-04 | 2 | -12/+20 |
| |_|/ |/| | | |||||
* | | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | | |||||
* | | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 |
| | | |||||
* | | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 1 | -4/+8 |
| | | | | | | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. | ||||
* | | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 1 | -1/+1 |
| | | |||||
* | | allow individual permissions on atokens | redmatrix | 2016-07-31 | 1 | -5/+59 |
| | | |||||
* | | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 2 | -3/+7 |
| | | | | | | | | storeurl and baseurl) | ||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 1 | -1/+1 |
|\ \ | |||||
| * | | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| |/ |