Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 21 | -566/+913 |
|\ | |||||
| * | fail oembed if it is attempted and less than 80% of the original content is l... | redmatrix | 2016-07-21 | 1 | -0/+11 |
| * | typo | redmatrix | 2016-07-21 | 1 | -1/+1 |
| * | issue #453 and a bug noted from the logfiles related to the schema change las... | redmatrix | 2016-07-20 | 1 | -1/+1 |
| * | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 6 | -85/+105 |
| |\ | |||||
| | * | fix vevent multi-line formatting | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | * | sort out some of the authentication mess - with luck this may fix the DAV aut... | redmatrix | 2016-07-20 | 5 | -84/+102 |
| * | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 2 | -5/+16 |
| * | | another couple of minor perms fixes | redmatrix | 2016-07-19 | 2 | -8/+10 |
| * | | permission fixes | redmatrix | 2016-07-19 | 2 | -7/+7 |
| * | | fixes to perms | redmatrix | 2016-07-19 | 1 | -3/+3 |
| * | | translate more old perms calls | redmatrix | 2016-07-19 | 2 | -2/+2 |
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-19 | 1 | -0/+1 |
| |\| | |||||
| * | | yet more grungy perms work. | redmatrix | 2016-07-19 | 1 | -37/+36 |
| * | | missing bracket | redmatrix | 2016-07-18 | 1 | -1/+2 |
| * | | more perms work (a lot more) | redmatrix | 2016-07-18 | 3 | -40/+83 |
| * | | move legacy code inside the legacy check | redmatrix | 2016-07-18 | 1 | -2/+3 |
| * | | more perms work | redmatrix | 2016-07-18 | 3 | -0/+16 |
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-18 | 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 | 6 | -26/+190 |
| |\ \ \ | |||||
| * | | | | more perms work | redmatrix | 2016-07-13 | 3 | -25/+34 |
| * | | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 4 | -29/+21 |
| * | | | | rework perm_is_allowed | redmatrix | 2016-07-13 | 1 | -4/+8 |
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| * | | | | | lots more permission work | redmatrix | 2016-07-13 | 1 | -2/+7 |
| * | | | | | more work on perms | redmatrix | 2016-07-12 | 2 | -18/+34 |
| * | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 5 | -193/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 3 | -21/+38 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 1 | -55/+17 |
| * | | | | | | | 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 | 2 | -2/+4 |
| * | | | | | | | more work on perms | redmatrix | 2016-07-09 | 2 | -7/+9 |
| * | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-05 | 4 | -338/+16 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 1 | -233/+244 |
| * | | | | | | | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 1 | -13/+16 |
* | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | issue #411 | redmatrix | 2016-07-19 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | do not transform hashes to tags in [code=xxx] or [code] blocks | Mario Vavti | 2016-07-18 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Importing webpage elements from manually entered cloud file path work. All de... | Andrew Manning | 2016-07-17 | 2 | -5/+5 |
* | | | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 2 | -5/+85 |
* | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 5 | -26/+126 |
|\| | | | | | | |||||
| * | | | | | | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 1 | -0/+9 |
| * | | | | | | make the xchan_hash for the access token location independent | redmatrix | 2016-07-14 | 1 | -12/+15 |
| * | | | | | | more ZAT work | redmatrix | 2016-07-14 | 3 | -2/+29 |
| * | | | | | | first cut at zot access tokens | redmatrix | 2016-07-14 | 2 | -24/+85 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -4/+3 |