Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 2 | -2/+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 |
| | | | | | | | | | | | | id. This fixes the issue that autocomplete for mail returns null for data.xid | ||||
| * | | 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 |
| | | | |||||
* | | | 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 |
|\| | | |||||
| * | | doc correction | 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 |
|\| | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-17 | 1 | -1/+1 |
| |\ | |||||
| | * | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | include attach.php at the module level since 2d4b75428a87038 wasn't ↵ | redmatrix | 2016-07-17 | 3 | -1/+4 |
| |/ | | | | | | | backported to dev and we're about to branch an RC | ||||
| * | os_delete_prohibit | redmatrix | 2016-07-16 | 1 | -0/+4 |
| | | |||||
| * | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 1 | -0/+10 |
| | | |||||
| * | remove expired access tokens | redmatrix | 2016-07-15 | 1 | -0/+9 |
| | | |||||
| * | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 1 | -2/+7 |
| | | |||||
| * | mod_home: if using an atoken login on the home page redirect to the channel ↵ | redmatrix | 2016-07-15 | 1 | -0/+13 |
| | | | | | | | | page of the channel that owns the atoken. | ||||
| * | make lockview work with throwaway identities | redmatrix | 2016-07-15 | 1 | -2/+33 |
| | | |||||
| * | more cleanup of atoken UI | redmatrix | 2016-07-15 | 1 | -1/+4 |
| | | |||||
| * | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 1 | -2/+2 |
| | | |||||
| * | enforce non-empty name and token/password on access tokens until better ↵ | redmatrix | 2016-07-15 | 1 | -9/+16 |
| | | | | | | | | checks are instituted. | ||||
| * | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 1 | -1/+77 |
| | | |||||
| * | make the xchan_hash for the access token location independent | redmatrix | 2016-07-14 | 1 | -4/+6 |
| | | |||||
| * | add zat to acl | redmatrix | 2016-07-14 | 1 | -1/+26 |
| | | |||||
| * | more ZAT work | redmatrix | 2016-07-14 | 1 | -1/+8 |
| | | |||||
* | | 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 |
|\| | |||||
| * | 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 |
| | | |