Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 3 | -2/+77 |
|\ | |||||
| * | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 3 | -2/+77 |
| |\ | | | | | | | allow multiple-file cloud upload | ||||
| | * | fix drag and drop | Mario Vavti | 2016-07-26 | 1 | -1/+1 |
| | | | |||||
| | * | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 2 | -1/+76 |
| | | | |||||
* | | | 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 | 2 | -2/+2 |
| | | |||||
* | | set App::$error on 404 so we don't get two 'Page not found.' page bodies. | redmatrix | 2016-07-26 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 3 | -6472/+6713 |
|\| | |||||
| * | Merge pull request #462 from wave72/dev | Wave | 2016-07-26 | 2 | -6471/+6711 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Wave72 | 2016-07-26 | 2 | -6471/+6711 |
| | | | |||||
| | * | Merge pull request #6 from redmatrix/dev | Wave | 2016-07-22 | 4855 | -289863/+312221 |
| | |\ | | | | | | | | | Dev | ||||
| * | | | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵ | Mario Vavti | 2016-07-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | clients | ||||
* | | | | issue #460 - remove reference to $a which was passed by value since it ↵ | redmatrix | 2016-07-26 | 1 | -53/+53 |
|/ / / | | | | | | | | | | doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier. | ||||
* | | | check for new permissions and update channels and connections with defaults ↵ | redmatrix | 2016-07-25 | 1 | -0/+64 |
| | | | | | | | | | | | | if any are found and if there are defaults for any channel roles which are being used on this site. | ||||
* | | | move openid to addon | redmatrix | 2016-07-25 | 2 | -517/+0 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-25 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | revert multiple test | Mario Vavti | 2016-07-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | css fixes | Mario Vavti | 2016-07-25 | 2 | -1/+2 |
| | | | | |||||
* | | | | issue #460 | redmatrix | 2016-07-25 | 1 | -1/+3 |
|/ / / | |||||
* | | | revert cloud acl selector (branched so as to continue development) | redmatrix | 2016-07-25 | 2 | -20/+8 |
| | | | |||||
* | | | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 2 | -2/+4 |
| | | | |||||
* | | | trace log pconfig cache if for some reason it isn't an array | redmatrix | 2016-07-24 | 2 | -1/+9 |
| | | | |||||
* | | | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 3 | -7/+76 |
| | | | | | | | | | | | | creation) | ||||
* | | | string update and some minor comment edits | redmatrix | 2016-07-24 | 3 | -1491/+1570 |
| | | | |||||
* | | | call wall_attach rather than wall_upload for drag/drop; which means you can ↵ | redmatrix | 2016-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | drag/drop any file and not just photos. | ||||
* | | | Merge pull request #459 from anaqreon/jot-drag-attach | hubzilla | 2016-07-25 | 2 | -1/+90 |
|\ \ \ | | | | | | | | | Drag and drop one image file at a time into the post editor will uplo… | ||||
| * | | | Drag and drop one image file at a time into the post editor will upload it. | Andrew Manning | 2016-07-24 | 2 | -1/+90 |
|/ / / | |||||
* | | | Merge pull request #458 from anaqreon/dragdropupload | hubzilla | 2016-07-24 | 5 | -21/+147 |
|\ \ \ | | | | | | | | | Drag-and-drop file upload for cloud files | ||||
| * | | | Remove logger calls | Andrew Manning | 2016-07-24 | 1 | -2/+1 |
| | | | | |||||
| * | | | Multiple file upload by drag and drop with progress indicators and auto page ↵ | Andrew Manning | 2016-07-24 | 4 | -195/+142 |
| | | | | | | | | | | | | | | | | reload | ||||
| * | | | Include credentials for session cookie in xhr | Andrew Manning | 2016-07-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | AJAX single upload might be working, but permissions problems seem to cause ↵ | Andrew Manning | 2016-07-23 | 2 | -14/+81 |
| | | | | | | | | | | | | | | | | failure. | ||||
| * | | | Drag and drop file information display in cloud files upload form. No actual ↵ | Andrew Manning | 2016-07-22 | 1 | -0/+112 |
|/ / / | | | | | | | | | | upload implemented yet. | ||||
* | | | rename the patch so that it explains what it does | Mario Vavti | 2016-07-22 | 1 | -0/+0 |
| | | | |||||
* | | | apply our custom patch to readmore.js | Mario Vavti | 2016-07-22 | 2 | -1/+14 |
| | | | |||||
* | | | upgrade readmore.js and improve collapsing a little | Mario Vavti | 2016-07-22 | 3 | -16/+40 |
| |/ |/| | |||||
* | | more work on #453 | redmatrix | 2016-07-21 | 1 | -16/+15 |
| | | |||||
* | | fix birthday addtocal | redmatrix | 2016-07-21 | 1 | -3/+3 |
| | | |||||
* | | 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. | ||||
* | | 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 ↵ | 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 |
| | | |