aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-238-8/+16
|\
| * optional server role compatibility checks for pluginsredmatrix2016-08-221-0/+1
| * server role management, part 1redmatrix2016-08-222-2/+2
| * Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju...redmatrix2016-08-214-5/+10
| |\
| | * move jotnets to jot and some cleanup (mostly whitespace)Mario Vavti2016-08-214-5/+9
| * | issue #496redmatrix2016-08-212-1/+3
| |/
* | Website export to cloud files works. Created new recursive copy function in a...Andrew Manning2016-08-231-8/+47
* | Block export and re-import works. Fixed bug where layout content was not bein...Andrew Manning2016-08-201-1/+68
* | Layouts list and are selectable for export to the zip fileAndrew Manning2016-08-201-14/+56
* | Export of pages and their layouts to a zip file works. Bug on importing the e...Andrew Manning2016-08-202-6/+193
* | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-192-1/+8
|\|
| * remove insecure repository warning.redmatrix2016-08-181-1/+1
| * don't set session theme unless logged in.redmatrix2016-08-161-0/+7
* | Pages populate the available-to-export list. New checkbox class for smaller b...Andrew Manning2016-08-191-4/+10
* | Progress implementing zip file exportAndrew Manning2016-08-171-2/+24
|/
* move schema settings into the display settings main so we can set theme:schem...redmatrix2016-08-152-17/+59
* fix attached photo/file permissions on clonesredmatrix2016-08-151-134/+2
* Added a disable comments setting to the "Additional features" settings with a...Andrew Manning2016-08-141-0/+2
* string updateredmatrix2016-08-121-1/+1
* fix auto-connect settingzottel2016-08-121-3/+0
* more cleanup of apiredmatrix2016-08-111-1/+1
* A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but yo...redmatrix2016-08-112-32/+47
* optimise Onepoll so it doesn't try and fetch posts for a channel that we've n...redmatrix2016-08-101-0/+9
* implement acl for folder creationMario Vavti2016-08-102-10/+18
* use config system.server_role and deprecate 'UNO'redmatrix2016-08-074-19/+23
* fix cloud pathredmatrix2016-08-071-1/+1
* bring back acl for cloud file uploadsMario Vavti2016-08-061-1/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0515-18/+83
|\
| * multi acl: port /settingsMario Vavti2016-08-051-1/+5
| * multi acl: port /displayMario Vavti2016-08-051-0/+1
| * multi acl: port /thingMario Vavti2016-08-051-0/+8
| * multi acl: port /rpostMario Vavti2016-08-052-5/+5
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-051-2/+3
| |\
| | * Parse bbcode when page loadsAndrew Manning2016-08-041-2/+2
| | * Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-031-0/+1
| * | multi acl: port /wikiMario Vavti2016-08-041-4/+13
| * | multi acl: port /webpages and /mitemMario Vavti2016-08-043-1/+11
| * | multi acl: port /chatMario Vavti2016-08-041-0/+4
| * | multi acl: port /cloud and /filestorageMario Vavti2016-08-042-6/+9
| * | multi acl: port photosMario Vavti2016-08-041-1/+9
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-041-1/+1
| |\|
| * | multi acl: port eventsMario Vavti2016-08-031-1/+11
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-038-17/+269
| |\ \
| * | | multiple acl workMario Vavti2016-08-033-2/+9
* | | | minor cleanup on ratings - no real functional changes at this timeredmatrix2016-08-042-12/+20
| |_|/ |/| |
* | | issue #473 - unable to delete privacy groupsredmatrix2016-08-031-1/+1
| |/ |/|
* | missing comma in atoken update sqlredmatrix2016-08-021-1/+1
* | this should sort out likes showing up as wall-to-wall posts on diasporaredmatrix2016-08-011-0/+2
* | This checkin should make all permission modes work correctly with atokens (th...redmatrix2016-08-012-7/+15
* | /storeurl/cloudurl/redmatrix2016-08-011-1/+1