aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* /storeurl/cloudurl/redmatrix2016-08-012-3/+3
* add a few more path macros to portable menu elements (channelurl, pageurl, st...redmatrix2016-07-313-12/+18
* make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ...redmatrix2016-07-312-0/+37
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-311-1/+1
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-302-16/+18
| |\
| * | issue #466, sql typoredmatrix2016-07-281-1/+1
* | | Improved UI. Removed logger statements.Andrew Manning2016-07-312-8/+5
* | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-307-77/+91
|\ \ \ | | |/ | |/|
| * | translate mime types to icons, update some icons, move file preview (upload p...Mario Vavti2016-07-282-16/+18
| |/
| * missing sredmatrix2016-07-261-1/+1
| * issue #460 - remove reference to $a which was passed by value since it doesn'...redmatrix2016-07-261-53/+53
| * issue #460redmatrix2016-07-251-1/+3
| * string update and some minor comment editsredmatrix2016-07-241-0/+1
| * fix birthday addtocalredmatrix2016-07-211-3/+3
| * zat URL auth updated to match changes to the atoken_login interfaceredmatrix2016-07-212-3/+12
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2121-566/+913
|\|
| * fail oembed if it is attempted and less than 80% of the original content is l...redmatrix2016-07-211-0/+11
| * typoredmatrix2016-07-211-1/+1
| * issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+1
| * Merge branch 'dev' into permsredmatrix2016-07-206-85/+105
| |\
| | * fix vevent multi-line formattingredmatrix2016-07-201-1/+3
| | * sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-205-84/+102
| * | fix the forum detection in include/zotredmatrix2016-07-192-5/+16
| * | another couple of minor perms fixesredmatrix2016-07-192-8/+10
| * | permission fixesredmatrix2016-07-192-7/+7
| * | fixes to permsredmatrix2016-07-191-3/+3
| * | translate more old perms callsredmatrix2016-07-192-2/+2
| * | Merge branch 'dev' into permsredmatrix2016-07-191-0/+1
| |\|
| * | yet more grungy perms work.redmatrix2016-07-191-37/+36
| * | missing bracketredmatrix2016-07-181-1/+2
| * | more perms work (a lot more)redmatrix2016-07-183-40/+83
| * | move legacy code inside the legacy checkredmatrix2016-07-181-2/+3
| * | more perms workredmatrix2016-07-183-0/+16
| * | Merge branch 'dev' into permsredmatrix2016-07-181-1/+1
| |\ \
| * | | more perms workredmatrix2016-07-182-5/+103
| * | | export/import channel permissionsredmatrix2016-07-172-9/+39
| * | | clone channel permsredmatrix2016-07-172-1/+71
| * | | Merge branch 'dev' into permsredmatrix2016-07-176-26/+190
| |\ \ \
| * | | | more perms workredmatrix2016-07-133-25/+34
| * | | | deprecate/remove json_decode_plusredmatrix2016-07-134-29/+21
| * | | | rework perm_is_allowedredmatrix2016-07-131-4/+8
| * | | | Merge branch 'dev' into permsredmatrix2016-07-131-3/+2
| |\ \ \ \
| * | | | | lots more permission workredmatrix2016-07-131-2/+7
| * | | | | more work on permsredmatrix2016-07-122-18/+34
| * | | | | Merge branch 'dev' into permsredmatrix2016-07-125-193/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-113-21/+38
| |\ \ \ \ \ \
| * | | | | | | more perms work - notably the stuff in public_permsredmatrix2016-07-111-55/+17
| * | | | | | | perms workredmatrix2016-07-101-37/+13
| * | | | | | | change default so we don't have to check for array existence laterredmatrix2016-07-091-1/+1
| * | | | | | | more permissions workredmatrix2016-07-092-2/+4