aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2152-796/+1516
|\
| * fail oembed if it is attempted and less than 80% of the original content is l...redmatrix2016-07-211-0/+11
| * merge 1.10RC into devMario Vavti2016-07-221-2/+2
| |\
| | * missing $Mario Vavti2016-07-221-2/+2
| | * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-211-0/+1
| | |\
| | | * issue #411redmatrix2016-07-211-0/+1
| | * | DAV auth issueredmatrix2016-07-211-0/+1
| | |/
| | * issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-202-2/+4
| | * undefined functionredmatrix2016-07-201-1/+1
| | * fix vevent multi-line formattingredmatrix2016-07-201-1/+3
| | * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-204-3/+10
| | |\
| | * | sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-2013-196/+133
| * | | DAV auth issueredmatrix2016-07-211-0/+1
| * | | typoredmatrix2016-07-211-1/+1
| * | | issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-202-2/+4
| * | | undefined functionredmatrix2016-07-201-1/+1
| * | | delete test docredmatrix2016-07-201-37/+0
| * | | Merge branch 'dev' into permsredmatrix2016-07-2014-197/+136
| |\ \ \
| | * | | 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-2013-196/+133
| * | | | Merge branch 'dev' into permsredmatrix2016-07-204-2/+10
| |\| | |
| * | | | fix the forum detection in include/zotredmatrix2016-07-193-7/+18
| * | | | another couple of minor perms fixesredmatrix2016-07-192-8/+10
| * | | | permission fixesredmatrix2016-07-196-25/+19
| * | | | fixes to permsredmatrix2016-07-192-4/+4
| * | | | add test sequenceredmatrix2016-07-191-0/+37
| * | | | translate more old perms callsredmatrix2016-07-194-5/+5
| * | | | Merge branch 'dev' into permsredmatrix2016-07-192-1/+2
| |\ \ \ \
| * | | | | yet more grungy perms work.redmatrix2016-07-191-37/+36
| * | | | | Merge branch 'dev' into permsredmatrix2016-07-181-10/+2
| |\ \ \ \ \
| * | | | | | missing bracketredmatrix2016-07-181-1/+2
| * | | | | | more perms work (a lot more)redmatrix2016-07-187-70/+164
| * | | | | | move legacy code inside the legacy checkredmatrix2016-07-181-2/+3
| * | | | | | more perms workredmatrix2016-07-184-0/+25
| * | | | | | 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-1743-2405/+2401
| |\ \ \ \ \ \ \
| * | | | | | | | more perms workredmatrix2016-07-135-33/+48
| * | | | | | | | deprecate/remove json_decode_plusredmatrix2016-07-136-33/+25
| * | | | | | | | rework perm_is_allowedredmatrix2016-07-131-4/+8
| * | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-132-5/+6
| |\ \ \ \ \ \ \ \
| * | | | | | | | | lots more permission workredmatrix2016-07-135-24/+50
| * | | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-135-29/+63
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | more work on permsredmatrix2016-07-125-36/+44
| * | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-1216-48/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-1122-1344/+1364
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | more perms work - notably the stuff in public_permsredmatrix2016-07-112-62/+30
| * | | | | | | | | | | | perms workredmatrix2016-07-101-37/+13