aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0514-18/+79
|\
| * 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-041-6/+5
| | |
| * | 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-036-14/+261
| |\ \
| * | | 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 ↵redmatrix2016-08-011-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/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, ↵redmatrix2016-07-312-3/+7
| | | | | | | | storeurl and baseurl)
* | 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-306-547/+58
|\|
| * github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-271-1/+0
| |
| * fix italian strings (messed up by rtl variable); and finish removing openid ↵redmatrix2016-07-271-12/+0
| | | | | | | | from core
| * add the hidden flag alsoredmatrix2016-07-271-1/+2
| |
| * don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |
| * move openid to addonredmatrix2016-07-252-517/+0
| |
| * make drag/drop work with acl, which bypassed the formredmatrix2016-07-241-0/+2
| |
| * add acl selection to files upload via /cloud (still missing from directory ↵redmatrix2016-07-241-0/+38
| | | | | | | | creation)
| * string update and some minor comment editsredmatrix2016-07-241-2/+2
| |
| * more work on #453redmatrix2016-07-211-16/+15
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2118-183/+177
|\|
| * issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-201-1/+3
| | | | | | | | last month
| * Merge branch 'dev' into permsredmatrix2016-07-206-85/+14
| |\
| | * sort out some of the authentication mess - with luck this may fix the DAV ↵redmatrix2016-07-206-85/+14
| | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
| * | Merge branch 'dev' into permsredmatrix2016-07-201-1/+2
| |\|
| * | fix the forum detection in include/zotredmatrix2016-07-191-2/+2
| | |
| * | permission fixesredmatrix2016-07-192-5/+7
| | |
| * | translate more old perms callsredmatrix2016-07-192-3/+3
| | |
| * | more perms work (a lot more)redmatrix2016-07-182-30/+38
| | |
| * | more perms workredmatrix2016-07-181-0/+9
| | |
| * | Merge branch 'dev' into permsredmatrix2016-07-177-4/+180
| |\ \