aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | | | | | | | | | | | | | change default so we don't have to check for array existence laterredmatrix2016-07-091-1/+1
* | | | | | | | | | | | | | more permissions workredmatrix2016-07-095-21/+39
* | | | | | | | | | | | | | more work on permsredmatrix2016-07-097-46/+51
* | | | | | | | | | | | | | revise how we store perm_limitsredmatrix2016-07-075-100/+25
* | | | | | | | | | | | | | more work on permissionsredmatrix2016-07-052-51/+64
* | | | | | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-056-343/+297
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | start to refactor the permission rolesredmatrix2016-07-042-23/+175
* | | | | | | | | | | | | | | more heavy lifting on xtensible permsredmatrix2016-07-045-242/+256
* | | | | | | | | | | | | | | more heavy lifting on extensible permsredmatrix2016-07-043-16/+38
* | | | | | | | | | | | | | | some perms fixes to stuff that was already written before I move onredmatrix2016-07-043-36/+48
* | | | | | | | | | | | | | | minorredmatrix2016-07-041-1/+1
* | | | | | | | | | | | | | | perms work - settings pageredmatrix2016-07-031-20/+13
* | | | | | | | | | | | | | | make permissionlimits into a classredmatrix2016-07-032-8/+46
* | | | | | | | | | | | | | | more work on x permissionsredmatrix2016-07-033-0/+139
* | | | | | | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-03315-11811/+14396
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | added permissionrolesredmatrix2016-06-272-30/+72
* | | | | | | | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-06-27610-100381/+125467
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | initial perms workredmatrix2016-06-091-0/+81
| | | | | | | | | | | | | | | | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | * | | | | Merge branch '1.10RC' into devMario Vavti2016-07-201-1/+1
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | * | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RCMario Vavti2016-07-202-0/+7
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ Merge pull request #456 from anaqreon/1.10RC-updatesgit-marijus2016-07-202-0/+7
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * | | | Wiki delete page confirmation and max image widthAndrew Manning2016-07-202-0/+7
| | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | / / / type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ...Mario Vavti2016-07-201-1/+1
| | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | | Merge pull request #455 from anaqreon/wikigit-marijus2016-07-202-0/+7
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-2070-2515/+2531
| | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | * | | | | | Merge branch '1.10RC' into devMario Vavti2016-07-201-2/+2
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | |/| | | |