Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 4 | -175/+7 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -2/+6 | |
| * | | | | | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 2 | -0/+38 | |
* | | | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 2 | -0/+12 | |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
* | | | | | | | | | translate mime types to icons, update some icons, move file preview (upload p... | Mario Vavti | 2016-07-28 | 2 | -16/+18 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | missing s | redmatrix | 2016-07-26 | 1 | -1/+1 | |
* | | | | | | | | issue #460 - remove reference to $a which was passed by value since it doesn'... | redmatrix | 2016-07-26 | 1 | -53/+53 | |
* | | | | | | | | issue #460 | redmatrix | 2016-07-25 | 1 | -1/+3 | |
* | | | | | | | | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -0/+1 | |
* | | | | | | | | fix birthday addtocal | redmatrix | 2016-07-21 | 1 | -3/+3 | |
* | | | | | | | | zat URL auth updated to match changes to the atoken_login interface | redmatrix | 2016-07-21 | 2 | -3/+12 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | 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 | |
|\| | | | | | | ||||||
| * | | | | | | issue #411 | 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 | |
|\| | | | | | | ||||||
| * | | | | | | do not transform hashes to tags in [code=xxx] or [code] blocks | Mario Vavti | 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 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | 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 | |
|\| | | | | ||||||
| * | | | | let abconfig specify a family | redmatrix | 2016-07-13 | 1 | -2/+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 | |
|\| | | | ||||||
| * | | | update_remote_id - updated to work with iconfig | redmatrix | 2016-07-12 | 1 | -18/+5 | |
| * | | | don't try to send sync packets to dead sites. | redmatrix | 2016-07-12 | 1 | -1/+6 | |
| | |/ | |/| | ||||||
| * | | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 2 | -173/+1 |