Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 26 | -225/+567 |
|\ | |||||
| * | merge 1.10RC into dev | Mario Vavti | 2016-07-22 | 1 | -2/+2 |
| |\ | |||||
| | * | missing $ | Mario Vavti | 2016-07-22 | 1 | -2/+2 |
| | * | DAV auth issue | redmatrix | 2016-07-21 | 1 | -0/+1 |
| | * | issue #453 and a bug noted from the logfiles related to the schema change las... | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | * | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 |
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-20 | 2 | -3/+3 |
| | |\ | |||||
| | * | | sort out some of the authentication mess - with luck this may fix the DAV aut... | redmatrix | 2016-07-20 | 7 | -110/+26 |
| * | | | DAV auth issue | redmatrix | 2016-07-21 | 1 | -0/+1 |
| * | | | issue #453 and a bug noted from the logfiles related to the schema change las... | redmatrix | 2016-07-20 | 1 | -1/+3 |
| * | | | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 |
| * | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 7 | -110/+26 |
| |\ \ \ | |||||
| | * | | | sort out some of the authentication mess - with luck this may fix the DAV aut... | redmatrix | 2016-07-20 | 7 | -110/+26 |
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 2 | -2/+3 |
| |\| | | | |||||
| * | | | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 1 | -2/+2 |
| * | | | | permission fixes | redmatrix | 2016-07-19 | 3 | -18/+11 |
| * | | | | fixes to perms | redmatrix | 2016-07-19 | 1 | -1/+1 |
| * | | | | translate more old perms calls | redmatrix | 2016-07-19 | 2 | -3/+3 |
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-19 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | more perms work (a lot more) | redmatrix | 2016-07-18 | 3 | -30/+80 |
| * | | | | | more perms work | redmatrix | 2016-07-18 | 1 | -0/+9 |
| * | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-17 | 11 | -6/+201 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | more perms work | redmatrix | 2016-07-13 | 2 | -8/+14 |
| * | | | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 2 | -4/+4 |
| * | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 1 | -2/+4 |
| |\ \ \ \ \ | |||||
| * | | | | | | lots more permission work | redmatrix | 2016-07-13 | 4 | -22/+43 |
| * | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 2 | -26/+60 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | more work on perms | redmatrix | 2016-07-12 | 3 | -18/+10 |
| * | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 10 | -22/+180 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 8 | -38/+20 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 1 | -7/+13 |
| * | | | | | | | | | more permissions work | redmatrix | 2016-07-09 | 3 | -19/+35 |
| * | | | | | | | | | more work on perms | redmatrix | 2016-07-09 | 2 | -2/+5 |
| * | | | | | | | | | revise how we store perm_limits | redmatrix | 2016-07-07 | 1 | -31/+8 |
| * | | | | | | | | | more work on permissions | redmatrix | 2016-07-05 | 2 | -51/+64 |
| * | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-05 | 2 | -5/+281 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | start to refactor the permission roles | redmatrix | 2016-07-04 | 2 | -23/+175 |
| * | | | | | | | | | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 4 | -9/+12 |
| * | | | | | | | | | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 2 | -3/+22 |
| * | | | | | | | | | | minor | redmatrix | 2016-07-04 | 1 | -1/+1 |
| * | | | | | | | | | | perms work - settings page | redmatrix | 2016-07-03 | 1 | -20/+13 |
| * | | | | | | | | | | make permissionlimits into a class | redmatrix | 2016-07-03 | 1 | -0/+46 |
| * | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-03 | 21 | -42/+225 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | added permissionroles | redmatrix | 2016-06-27 | 2 | -30/+72 |
| * | | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-06-27 | 55 | -244/+2058 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | initial perms work | redmatrix | 2016-06-09 | 1 | -0/+81 |
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch '1.10RC' into dev | Mario Vavti | 2016-07-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ... | Mario Vavti | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch '1.10RC' into dev | Mario Vavti | 2016-07-20 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |