Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 4 | -2/+10 |
|\ | |||||
| * | 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 |
| | |\ \ \ | |||||
| | * | | | | Set max-width for embedded images | Andrew Manning | 2016-07-09 | 1 | -0/+4 |
| | * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 22 | -1674/+1724 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-01 | 15 | -3589/+3645 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | JavaScript popup for page delete confirmation | Andrew Manning | 2016-07-01 | 1 | -0/+3 |
| * | | | | | | | 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 |
* | | | | | | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 3 | -7/+18 |
* | | | | | | | another couple of minor perms fixes | redmatrix | 2016-07-19 | 2 | -8/+10 |
* | | | | | | | permission fixes | redmatrix | 2016-07-19 | 6 | -25/+19 |
* | | | | | | | fixes to perms | redmatrix | 2016-07-19 | 2 | -4/+4 |
* | | | | | | | add test sequence | redmatrix | 2016-07-19 | 1 | -0/+37 |
* | | | | | | | translate more old perms calls | redmatrix | 2016-07-19 | 4 | -5/+5 |
* | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-19 | 2 | -1/+2 |
|\| | | | | | | |||||
| * | | | | | | doc correction | redmatrix | 2016-07-19 | 1 | -1/+1 |
| * | | | | | | issue #411 | redmatrix | 2016-07-19 | 1 | -0/+1 |
* | | | | | | | yet more grungy perms work. | redmatrix | 2016-07-19 | 1 | -37/+36 |
* | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-18 | 1 | -10/+2 |
|\| | | | | | | |||||
| * | | | | | | runaway cron emails | redmatrix | 2016-07-18 | 1 | -10/+2 |
* | | | | | | | missing bracket | redmatrix | 2016-07-18 | 1 | -1/+2 |
* | | | | | | | more perms work (a lot more) | redmatrix | 2016-07-18 | 7 | -70/+164 |
* | | | | | | | move legacy code inside the legacy check | redmatrix | 2016-07-18 | 1 | -2/+3 |
* | | | | | | | more perms work | redmatrix | 2016-07-18 | 4 | -0/+25 |
* | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-18 | 1 | -1/+1 |
|\| | | | | | | |||||
| * | | | | | | 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 |
* | | | | | | more perms work | redmatrix | 2016-07-18 | 2 | -5/+103 |
* | | | | | | export/import channel permissions | redmatrix | 2016-07-17 | 2 | -9/+39 |
* | | | | | | clone channel perms | redmatrix | 2016-07-17 | 2 | -1/+71 |
* | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-17 | 43 | -2405/+2401 |
|\| | | | | | |||||
| * | | | | | roll version | redmatrix | 2016-07-17 | 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 |
| |/ / / / | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-17 | 2 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 2 | -1/+3 |
| * | | | | | include attach.php at the module level since 2d4b75428a87038 wasn't backporte... | redmatrix | 2016-07-17 | 3 | -1/+4 |
| |/ / / / | |||||
| * | | | | booboo | redmatrix | 2016-07-17 | 1 | -2/+2 |