| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 1 | -0/+2 |
| * | add acl selection to files upload via /cloud (still missing from directory cr... | redmatrix | 2016-07-24 | 1 | -0/+38 |
| * | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -2/+2 |
| * | more work on #453 | redmatrix | 2016-07-21 | 1 | -16/+15 |
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 18 | -183/+177 |
|\| |
|
| * | issue #453 and a bug noted from the logfiles related to the schema change las... | redmatrix | 2016-07-20 | 1 | -1/+3 |
| * | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 6 | -85/+14 |
| |\ |
|
| | * | sort out some of the authentication mess - with luck this may fix the DAV aut... | redmatrix | 2016-07-20 | 6 | -85/+14 |
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 1 | -1/+2 |
| |\| |
|
| * | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 1 | -2/+2 |
| * | | permission fixes | redmatrix | 2016-07-19 | 2 | -5/+7 |
| * | | translate more old perms calls | redmatrix | 2016-07-19 | 2 | -3/+3 |
| * | | more perms work (a lot more) | redmatrix | 2016-07-18 | 2 | -30/+38 |
| * | | more perms work | redmatrix | 2016-07-18 | 1 | -0/+9 |
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-17 | 7 | -4/+180 |
| |\ \ |
|
| * | | | more perms work | redmatrix | 2016-07-13 | 2 | -8/+14 |
| * | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 2 | -4/+4 |
| * | | | lots more permission work | redmatrix | 2016-07-13 | 3 | -21/+42 |
| * | | | 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 | 9 | -22/+10 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 5 | -36/+15 |
| |\ \ \ \ \ |
|
| * | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 1 | -7/+13 |
| * | | | | | | more permissions work | redmatrix | 2016-07-09 | 2 | -3/+19 |
| * | | | | | | more work on perms | redmatrix | 2016-07-09 | 1 | -1/+2 |
| * | | | | | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 2 | -5/+8 |
| * | | | | | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 1 | -3/+8 |
| * | | | | | | perms work - settings page | redmatrix | 2016-07-03 | 1 | -20/+13 |
* | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 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 remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -0/+4 |
|\| | | | | |
|
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-17 | 1 | -1/+1 |
| |\ \ \ \ \ |
|
| * | | | | | | include attach.php at the module level since 2d4b75428a87038 wasn't backporte... | redmatrix | 2016-07-17 | 2 | -0/+4 |
* | | | | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 1 | -80/+98 |
* | | | | | | | Importing webpage elements from manually entered cloud file path work. All de... | Andrew Manning | 2016-07-17 | 1 | -2/+21 |
* | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 1 | -1/+1 |
| |/ / / / / |
|
* | | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 1 | -51/+5 |
* | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 4 | -4/+176 |
|\| | | | | |
|
| * | | | | | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 1 | -0/+10 |
| * | | | | | 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 p... | redmatrix | 2016-07-15 | 1 | -0/+13 |
| * | | | | | 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 check... | redmatrix | 2016-07-15 | 1 | -9/+16 |
| * | | | | | 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 |
| | |_|_|/
| |/| | | |
|
* | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+43 |