aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-3119-7589/+7848
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-3010-5092/+5417
| |\
| | * Updating es-es stringsjeroenpraat2016-07-292-5059/+5299
| | |
| | * catch all input fields (in preparation for acl in this place) and display ↵Mario Vavti2016-07-292-4/+9
| | | | | | | | | | | | the files to upload in the right order
| | * Merge pull request #467 from anaqreon/multiple-attachhubzilla2016-07-291-3/+3
| | |\ | | | | | | | | Fixed bug where multiple post attachements by drag-and-drop were not …
| | | * Fixed bug where multiple post attachements by drag-and-drop were not being ↵Andrew Manning2016-07-281-3/+3
| | |/ | | | | | | | | | added to the post content.
| | * missing spaceMario Vavti2016-07-281-1/+1
| | |
| | * missing semicolonMario Vavti2016-07-281-1/+1
| | |
| | * add more info on what is happening after we are at 100% and minor fixesMario Vavti2016-07-283-5/+21
| | |
| | * re-implement progress-bar to work with all browsersMario Vavti2016-07-282-5/+15
| | |
| | * reusing the original form did not work so well via xhr upload - let us ↵Mario Vavti2016-07-282-9/+13
| | | | | | | | | | | | create a new form for this action. revert progressbar- only works nice in firefox
| | * make progressbar slightly more transparent and give it a default width of ↵Mario Vavti2016-07-281-1/+1
| | | | | | | | | | | | 3px to indicate which files are to be uploaded
| | * use single quote for js and double quote for html with proper escapes and ↵Mario Vavti2016-07-281-6/+7
| | | | | | | | | | | | implement a simple progressbar
| | * translate mime types to icons, update some icons, move file preview (upload ↵Mario Vavti2016-07-283-21/+70
| | | | | | | | | | | | progress) below table header
| * | issue #466, sql typoredmatrix2016-07-283-3/+3
| |/
| * github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-273-2/+1
| |
| * fix italian strings (messed up by rtl variable); and finish removing openid ↵redmatrix2016-07-273-2324/+2313
| | | | | | | | from core
| * Merge pull request #464 from anaqreon/hover-visualshubzilla2016-07-282-6/+5
| |\ | | | | | | Enhanced visual feedback for file drag hover
| | * Enhanced visual feedback for file drag hoverAndrew Manning2016-07-272-6/+5
| |/
| * add the hidden flag alsoredmatrix2016-07-271-1/+2
| |
| * rework drag and drop to drag directly into files area, implement the default ↵Mario Vavti2016-07-276-175/+121
| | | | | | | | 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 remote-tracking branch 'upstream/dev' into devzottel2016-07-2712-6530/+6853
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-2/+77
| |\
| | * Merge pull request #463 from git-marijus/devhubzilla2016-07-273-2/+77
| | |\ | | | | | | | | allow multiple-file cloud upload
| | | * fix drag and dropMario Vavti2016-07-261-1/+1
| | | |
| | | * allow multiple-file cloud uploadMario Vavti2016-07-262-1/+76
| | | |
| * | | don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |/ /
| * | restrict url cache to 254 maxlenredmatrix2016-07-261-0/+5
| | |
| * | missing sredmatrix2016-07-262-2/+2
| | |
| * | set App::$error on 404 so we don't get two 'Page not found.' page bodies.redmatrix2016-07-261-0/+1
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-6472/+6713
| |\|
| | * Merge pull request #462 from wave72/devWave2016-07-262-6471/+6711
| | |\ | | | | | | | | Updated Italian strings
| | | * Updated Italian stringsWave722016-07-262-6471/+6711
| | | |
| | | * Merge pull request #6 from redmatrix/devWave2016-07-224855-289863/+312221
| | | |\ | | | | | | | | | | Dev
| | * | | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵Mario Vavti2016-07-261-1/+2
| | | | | | | | | | | | | | | | | | | | clients
| * | | | issue #460 - remove reference to $a which was passed by value since it ↵redmatrix2016-07-261-53/+53
| |/ / / | | | | | | | | | | | | doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
* | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-264-518/+67
|\| | |
| * | | check for new permissions and update channels and connections with defaults ↵redmatrix2016-07-251-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 addonredmatrix2016-07-252-517/+0
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-252-1/+2
| |\ \ \
| * | | | issue #460redmatrix2016-07-251-1/+3
| | | | |
* | | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-2513-1515/+1877
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | revert multiple testMario Vavti2016-07-251-1/+1
| | | | |
| * | | | css fixesMario Vavti2016-07-252-1/+2
| |/ / /
| * | | revert cloud acl selector (branched so as to continue development)redmatrix2016-07-252-20/+8
| | | |
| * | | make drag/drop work with acl, which bypassed the formredmatrix2016-07-242-2/+4
| | | |
| * | | trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-242-1/+9
| | | |
| * | | add acl selection to files upload via /cloud (still missing from directory ↵redmatrix2016-07-243-7/+76
| | | | | | | | | | | | | | | | creation)
| * | | string update and some minor comment editsredmatrix2016-07-243-1491/+1570
| | | |
| * | | call wall_attach rather than wall_upload for drag/drop; which means you can ↵redmatrix2016-07-241-1/+1
| | | | | | | | | | | | | | | | drag/drop any file and not just photos.