Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 12 | -554/+103 | |
|\| | ||||||
| * | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 1 | -1/+0 | |
| | | ||||||
| * | fix italian strings (messed up by rtl variable); and finish removing openid ↵ | redmatrix | 2016-07-27 | 1 | -12/+0 | |
| | | | | | | | | from core | |||||
| * | add the hidden flag also | redmatrix | 2016-07-27 | 1 | -1/+2 | |
| | | ||||||
| * | rework drag and drop to drag directly into files area, implement the default ↵ | Mario Vavti | 2016-07-27 | 1 | -75/+0 | |
| | | | | | | | | upload button to work with the same mechanism as drag and drop, revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well with the new cloud upload mechanism | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 1 | -0/+75 | |
| |\ | ||||||
| | * | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 1 | -0/+75 | |
| | |\ | | | | | | | | | allow multiple-file cloud upload | |||||
| | | * | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 1 | -0/+75 | |
| | | | | ||||||
| * | | | don't include deleted or orphaned xchans in ratings search | redmatrix | 2016-07-26 | 1 | -1/+2 | |
| |/ / | ||||||
| * | | restrict url cache to 254 maxlen | redmatrix | 2016-07-26 | 1 | -0/+5 | |
| | | | ||||||
| * | | missing s | redmatrix | 2016-07-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | set App::$error on 404 so we don't get two 'Page not found.' page bodies. | redmatrix | 2016-07-26 | 1 | -0/+1 | |
| |/ | ||||||
| * | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵ | Mario Vavti | 2016-07-26 | 1 | -1/+2 | |
| | | | | | | | | clients | |||||
| * | move openid to addon | redmatrix | 2016-07-25 | 2 | -517/+0 | |
| | | ||||||
| * | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 1 | -0/+2 | |
| | | ||||||
| * | trace log pconfig cache if for some reason it isn't an array | redmatrix | 2016-07-24 | 1 | -0/+8 | |
| | | ||||||
| * | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 2 | -1/+58 | |
| | | | | | | | | creation) | |||||
| * | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -2/+2 | |
| | | ||||||
| * | Multiple file upload by drag and drop with progress indicators and auto page ↵ | Andrew Manning | 2016-07-24 | 1 | -1/+2 | |
| | | | | | | | | reload | |||||
| * | more work on #453 | redmatrix | 2016-07-21 | 1 | -16/+15 | |
| | | ||||||
| * | PConfig : Check for is_null($uid) as well as false. We actually allow $uid = ↵ | redmatrix | 2016-07-21 | 1 | -3/+6 | |
| | | | | | | | | 0 though it shouldn't normally happen. | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 26 | -225/+567 | |
|\| | ||||||
| * | merge 1.10RC into dev | Mario Vavti | 2016-07-22 | 1 | -2/+2 | |
| |\ | ||||||
| | * | missing $ | Mario Vavti | 2016-07-22 | 1 | -2/+2 | |
| | | | ||||||
| | * | 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 | 1 | -1/+3 | |
| | | | | | | | | | | | | last month | |||||
| | * | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-20 | 2 | -3/+3 | |
| | |\ | ||||||
| | * | | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 7 | -110/+26 | |
| | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | |||||
| * | | | 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 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | last month | |||||
| * | | | undefined function | redmatrix | 2016-07-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 7 | -110/+26 | |
| |\ \ \ | ||||||
| | * | | | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 7 | -110/+26 | |
| | | | | | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | |||||
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 2 | -2/+3 | |
| |\| | | | ||||||
| * | | | | 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 | |
| |\ \ \ \ | ||||||
| * | | | | | 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 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| * | | | | | 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 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | lots more permission work | redmatrix | 2016-07-13 | 4 | -22/+43 | |
| | | | | | | | ||||||
| * | | | | | | 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 | 10 | -22/+180 | |
| |\ \ \ \ \ \ \ |