Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 52 | -796/+1516 |
|\ | |||||
| * | fail oembed if it is attempted and less than 80% of the original content is ↵ | redmatrix | 2016-07-21 | 1 | -0/+11 |
| | | | | | | | | left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link. | ||||
| * | merge 1.10RC into dev | Mario Vavti | 2016-07-22 | 1 | -2/+2 |
| |\ | |||||
| | * | missing $ | Mario Vavti | 2016-07-22 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-21 | 1 | -0/+1 |
| | |\ | |||||
| | | * | issue #411 | redmatrix | 2016-07-21 | 1 | -0/+1 |
| | | | | |||||
| | * | | DAV auth issue | redmatrix | 2016-07-21 | 1 | -0/+1 |
| | |/ | |||||
| | * | issue #453 and a bug noted from the logfiles related to the schema change ↵ | redmatrix | 2016-07-20 | 2 | -2/+4 |
| | | | | | | | | | | | | last month | ||||
| | * | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 |
| | | | |||||
| | * | fix vevent multi-line formatting | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | | | |||||
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-20 | 4 | -3/+10 |
| | |\ | |||||
| | * | | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 13 | -196/+133 |
| | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | ||||
| * | | | DAV auth issue | redmatrix | 2016-07-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | typo | redmatrix | 2016-07-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | issue #453 and a bug noted from the logfiles related to the schema change ↵ | redmatrix | 2016-07-20 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | last month | ||||
| * | | | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | delete test doc | redmatrix | 2016-07-20 | 1 | -37/+0 |
| | | | | |||||
| * | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 14 | -197/+136 |
| |\ \ \ | |||||
| | * | | | 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 ↵ | redmatrix | 2016-07-20 | 13 | -196/+133 |
| | | | | | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | ||||
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 4 | -2/+10 |
| |\| | | | |||||
| * | | | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 3 | -7/+18 |
| | | | | | |||||
| * | | | | another couple of minor perms fixes | redmatrix | 2016-07-19 | 2 | -8/+10 |
| | | | | | |||||
| * | | | | permission fixes | redmatrix | 2016-07-19 | 6 | -25/+19 |
| | | | | | |||||
| * | | | | fixes to perms | redmatrix | 2016-07-19 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | add test sequence | redmatrix | 2016-07-19 | 1 | -0/+37 |
| | | | | | |||||
| * | | | | translate more old perms calls | redmatrix | 2016-07-19 | 4 | -5/+5 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-19 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| * | | | | | yet more grungy perms work. | redmatrix | 2016-07-19 | 1 | -37/+36 |
| | | | | | | |||||
| * | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-18 | 1 | -10/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | missing bracket | redmatrix | 2016-07-18 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | more perms work (a lot more) | redmatrix | 2016-07-18 | 7 | -70/+164 |
| | | | | | | | |||||
| * | | | | | | move legacy code inside the legacy check | redmatrix | 2016-07-18 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | more perms work | redmatrix | 2016-07-18 | 4 | -0/+25 |
| | | | | | | | |||||
| * | | | | | | 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 | 43 | -2405/+2401 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | more perms work | redmatrix | 2016-07-13 | 5 | -33/+48 |
| | | | | | | | | | |||||
| * | | | | | | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 6 | -33/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | rework perm_is_allowed | redmatrix | 2016-07-13 | 1 | -4/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | lots more permission work | redmatrix | 2016-07-13 | 5 | -24/+50 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 5 | -29/+63 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | more work on perms | redmatrix | 2016-07-12 | 5 | -36/+44 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 16 | -48/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 22 | -1344/+1364 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 2 | -62/+30 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | perms work | redmatrix | 2016-07-10 | 1 | -37/+13 |
| | | | | | | | | | | | | |