Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 2 | -4/+4 |
| | |||||
* | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 1 | -2/+4 |
|\ | |||||
| * | let abconfig specify a family | 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 |
|\| | |||||
| * | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 1 | -25/+59 |
| | | | | | | | | consolidate the various options | ||||
| * | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 |
| | | |||||
* | | more work on perms | redmatrix | 2016-07-12 | 3 | -18/+10 |
| | | |||||
* | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 10 | -22/+180 |
|\| | |||||
| * | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 10 | -22/+180 |
| | | |||||
* | | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 8 | -38/+20 |
|\| | |||||
| * | force non-null sess_data | redmatrix | 2016-07-11 | 1 | -1/+2 |
| | | |||||
| * | use the profile_uid here. | redmatrix | 2016-07-11 | 1 | -7/+2 |
| | | |||||
| * | remove check for mcrypt | Mario Vavti | 2016-07-10 | 1 | -5/+0 |
| | | |||||
| * | gak one more typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | | |||||
| * | typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | | |||||
| * | duplicate supression SQL query was horribly inefficient and could cause ↵ | redmatrix | 2016-07-07 | 1 | -11/+13 |
| | | | | | | | | issues in resource deprived environments. | ||||
| * | Merge pull request #450 from git-marijus/dev | hubzilla | 2016-07-08 | 3 | -14/+2 |
| |\ | | | | | | | fix /cloud after recent changes | ||||
| | * | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 3 | -13/+2 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 4 | -7/+285 |
| | |\ | |||||
| | * | | fix /cloud after recent changes | Mario Vavti | 2016-07-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | hide the redeliver option one level down since it should rarely be needed by ↵ | redmatrix | 2016-07-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | folks outside of shared hosting. | ||||
| * | | | expire crashing on shared hosting from memory exhaustion. Lower the expire ↵ | redmatrix | 2016-07-06 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression. | ||||
* | | | 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 |
|\| | | |||||
| * | | merge include/reddav.php into Zotlabs/Storage/Directory.php | redmatrix | 2016-07-05 | 1 | -4/+280 |
| | | | |||||
| * | | regression - save bookmarks no longer present in item menu | redmatrix | 2016-07-05 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
|\| | | |||||
| * | | force immediate avatar update | Treer | 2016-07-03 | 1 | -0/+2 |
| | | | |||||
| * | | Mark nickname as required field, if left empty then channel creation fails ↵ | Treer | 2016-07-03 | 1 | -2/+2 |
| |/ | | | | | | | silently | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-01 | 1 | -2/+4 |
| |\ | |||||
| | * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 1 | -2/+4 |
| | | | |||||
| * | | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵ | redmatrix | 2016-07-01 | 1 | -9/+5 |
| | | | | | | | | | | | | another at the main module level | ||||
| * | | use small photo for Diaspora attribution correction; the medium looks ↵ | redmatrix | 2016-07-01 | 1 | -0/+9 |
| |/ | | | | | | | awkward in the D* stream. | ||||
| * | allow multiple apd's per plugin dir | redmatrix | 2016-07-01 | 2 | -2/+5 |
| | | |||||
| * | disable wiki if feature disabled, sync updates of delayed publish posts | redmatrix | 2016-06-30 | 3 | -2/+17 |
| | | |||||
| * | sync flags even if post has not been edited | redmatrix | 2016-06-30 | 1 | -1/+14 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 37 | -55/+242 |
| |\ | |||||
| | * | dreport: convert timestamp to channel localtime and get rid of old ↵ | redmatrix | 2016-06-29 | 1 | -11/+1 |
| | | | | | | | | | | | | pre-template code | ||||
| | * | templatise the Dreport page and add a redeliver option for when things stuff ↵ | redmatrix | 2016-06-29 | 1 | -9/+43 |
| | | | | | | | | | | | | up badly. |