| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 6 | -33/+25 | |
| | * | | | | | | | | | rework perm_is_allowed | redmatrix | 2016-07-13 | 1 | -4/+8 | |
| | * | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 2 | -5/+6 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | lots more permission work | redmatrix | 2016-07-13 | 5 | -24/+50 | |
| | * | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 5 | -29/+63 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | more work on perms | redmatrix | 2016-07-12 | 5 | -36/+44 | |
| | * | | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 16 | -48/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 22 | -1344/+1364 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 2 | -62/+30 | |
| | * | | | | | | | | | | | | | perms work | redmatrix | 2016-07-10 | 1 | -37/+13 | |
| | * | | | | | | | | | | | | | change default so we don't have to check for array existence later | redmatrix | 2016-07-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | more permissions work | redmatrix | 2016-07-09 | 5 | -21/+39 | |
| | * | | | | | | | | | | | | | more work on perms | redmatrix | 2016-07-09 | 7 | -46/+51 | |
| | * | | | | | | | | | | | | | revise how we store perm_limits | redmatrix | 2016-07-07 | 5 | -100/+25 | |
| | * | | | | | | | | | | | | | more work on permissions | redmatrix | 2016-07-05 | 2 | -51/+64 | |
| | * | | | | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-05 | 6 | -343/+297 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | start to refactor the permission roles | redmatrix | 2016-07-04 | 2 | -23/+175 | |
| | * | | | | | | | | | | | | | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 5 | -242/+256 | |
| | * | | | | | | | | | | | | | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 3 | -16/+38 | |
| | * | | | | | | | | | | | | | | some perms fixes to stuff that was already written before I move on | redmatrix | 2016-07-04 | 3 | -36/+48 | |
| | * | | | | | | | | | | | | | | 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 | 2 | -8/+46 | |
| | * | | | | | | | | | | | | | | more work on x permissions | redmatrix | 2016-07-03 | 3 | -0/+139 | |
| | * | | | | | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-03 | 315 | -11811/+14396 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | added permissionroles | redmatrix | 2016-06-27 | 2 | -30/+72 | |
| | * | | | | | | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-06-27 | 610 | -100381/+125467 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC | Mario Vavti | 2016-07-20 | 2 | -0/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #456 from anaqreon/1.10RC-updates | git-marijus | 2016-07-20 | 2 | -0/+7 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | Wiki delete page confirmation and max image width | Andrew Manning | 2016-07-20 | 2 | -0/+7 | |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | ||||||
| | | * | / | | | | | | | | | | | | | | 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 pull request #455 from anaqreon/wiki | git-marijus | 2016-07-20 | 2 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-20 | 70 | -2515/+2531 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge branch '1.10RC' into dev | Mario Vavti | 2016-07-20 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | fix /mail wsod issue reported by giac hellvecio | Mario Vavti | 2016-07-20 | 1 | -2/+2 | |
| | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-18 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | runaway cron emails | redmatrix | 2016-07-18 | 1 | -10/+2 | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 9 | -15/+52 | |
| |\| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | doc correction | redmatrix | 2016-07-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | issue #411 | redmatrix | 2016-07-19 | 1 | -0/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | runaway cron emails | redmatrix | 2016-07-18 | 1 | -10/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | whitespace | Mario Vavti | 2016-07-18 | 1 | -2/+0 | |
| | * | | | | | | | | | | | | | | resolve merge conflict | Mario Vavti | 2016-07-18 | 2 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | do not transform hashes to tags in [code=xxx] or [code] blocks | Mario Vavti | 2016-07-18 | 1 | -1/+1 | |
| | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | update changelog | redmatrix | 2016-07-17 | 1 | -0/+41 | |
| | | * | | | | | | | | | | | jquery update issue prevents comments from reloading and resetting watch cursor | redmatrix | 2016-07-17 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | change std_version | redmatrix | 2016-07-17 | 1 | -1/+1 | |
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |