aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '1.12RC'"redmatrix2016-08-2228-538/+120
* Revert "more missing files from merge"redmatrix2016-08-223-367/+0
* more missing files from mergeredmatrix2016-08-223-0/+367
* Merge branch '1.12RC'redmatrix2016-08-2228-120/+538
|\
| * issue #496redmatrix2016-08-212-1/+3
| * Fix for older photos not being embedded by the embedphotos tool.Andrew Manning2016-08-131-2/+4
| * Fixed bug preventing images in root photo album from loading in embedphotos d...Andrew Manning2016-08-131-3/+3
| * fix auto-connect settingzottel2016-08-121-3/+0
| * 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
| * | allow individual permissions on atokensredmatrix2016-07-311-5/+59
| * | add a few more path macros to portable menu elements (channelurl, pageurl, st...redmatrix2016-07-312-3/+7
| * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-311-1/+1
| |\ \
| | * | issue #466, sql typoredmatrix2016-07-281-1/+1
| | |/
| * | Improved UI. Removed logger statements.Andrew Manning2016-07-311-9/+17
| * | Import element selection page added to allow selective importing.Andrew Manning2016-07-301-22/+91
| * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3012-554/+103
| |\|
| * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2126-225/+567
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-204-2/+5
| |\ \ \ \
| * | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-201-80/+98
| * | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-171-2/+21
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-171-1/+1
| |\ \ \ \ \
| * | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-172-51/+6
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-167-5/+197
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 01:38:56 +0000