summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #6585 from nextcloud/theming-fileupload-errorhandlingRoeland Jago Douma2017-10-154-22/+222
|\ \ \ \ \
| * | | | | Theming: Add tests for mimetype and upload error checksJulius Härtl2017-10-032-15/+170
| * | | | | Theming: Fix message/loading display on errorsJulius Härtl2017-10-032-0/+3
| * | | | | Theming: Check valid image format also for logoJulius Härtl2017-10-031-0/+12
| * | | | | Theming: Handle errors on uploaded files properlyJulius Härtl2017-10-032-17/+47
* | | | | | Merge pull request #6812 from nextcloud/upload-cache-pathRoeland Jago Douma2017-10-151-1/+3
|\ \ \ \ \ \
| * | | | | | also use configured 'cache_path' for new chunkingRobin Appelman2017-10-111-1/+3
* | | | | | | Merge pull request #6791 from nextcloud/fix-test-warningsRoeland Jago Douma2017-10-152-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Don't use deprecated $this->getMock() methodJoas Schilling2017-10-091-2/+2
| * | | | | | | Fix tests with group managerJoas Schilling2017-10-091-1/+1
* | | | | | | | Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookieRoeland Jago Douma2017-10-151-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Exclude avatar from Same-Site Cookie requirementLukas Reschke2017-10-111-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6761 from nextcloud/fix-avatar-loading-stateJohn Molakvoæ2017-10-143-36/+51
|\ \ \ \ \ \ \
| * | | | | | | EllipsisJohn Molakvoæ (skjnldsv)2017-10-141-0/+5
| * | | | | | | Fix popover position and avatar loadingJohn Molakvoæ (skjnldsv)2017-10-143-36/+46
|/ / / / / / /
* | | | | | | Merge pull request #6829 from nextcloud/fix-app-nav-edit-inputsJohn Molakvoæ2017-10-141-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix app-navigation editable entry input colorsJohn Molakvoæ (skjnldsv)2017-10-131-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1426-38/+552
* | | | | | | Merge pull request #6826 from nextcloud/fix-class-name-in-exception-logger-pl...Joas Schilling2017-10-131-6/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use ::class to avoid errorsJoas Schilling2017-10-131-6/+12
| * | | | | | Fix class name, regression from 44cf67accdc294f46bf82b3f8661f353dc5e22f0Joas Schilling2017-10-131-1/+1
|/ / / / / /
* | | | | | Merge pull request #6816 from nextcloud/external-storage-confirm-delete-fixJoas Schilling2017-10-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fix confirmation dialog when deleting external storageRobin Appelman2017-10-121-1/+1
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1310-4/+194
* | | | | | | Merge pull request #6818 from nextcloud/allow-div-on-nav-edit-entry-instead-o...John Molakvoæ2017-10-121-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Allow div instead of forms on editable nav entriesJohn Molakvoæ (skjnldsv)2017-10-121-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #6795 from nextcloud/fix/contactsmenu-ie11blizzz2017-10-121-2/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix contacts menu for IE11Christoph Wurst2017-10-091-2/+13
* | | | | | | | Merge pull request #6763 from nextcloud/fix-user-quotaJohn Molakvoæ2017-10-123-7/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct class to quotaJohn Molakvoæ (skjnldsv)2017-10-122-4/+3
| * | | | | | | | Fix quota overflow and error colorJohn Molakvoæ (skjnldsv)2017-10-121-3/+1
|/ / / / / / / /
* | / / / / / / [tx-robot] updated from transifexNextcloud bot2017-10-1218-0/+68
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #6602 from nextcloud/s3-multipart-uploadRobin Appelman2017-10-112-5/+61
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | set s3 part size to 500mbRobin Appelman2017-10-111-1/+3
| * | | | | | Add tests for multipart uploadRobin Appelman2017-09-212-6/+19
| * | | | | | only do multipart upload for large filesRobin Appelman2017-09-211-0/+24
| * | | | | | multipart upload for s3 object storageRobin Appelman2017-09-201-5/+22
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1182-150/+152
* | | | | | | Merge pull request #6739 from nextcloud/apps-management-updatesJulius Härtl2017-10-106-18/+115
|\ \ \ \ \ \ \
| * | | | | | | App management: Do not show udpdate category if no updates are availableJulius Härtl2017-10-101-3/+30
| * | | | | | | App management: Show proper message when no updates are availableJulius Härtl2017-10-102-6/+31
| * | | | | | | App management: do not reset update counter to 0 on category changeJulius Härtl2017-10-101-1/+0
| * | | | | | | Do not return app names multiple timesJulius Härtl2017-10-101-0/+2
| * | | | | | | App management: add update sectionJulius Härtl2017-10-105-16/+60
|/ / / / / / /
* | | | | | | Merge pull request #6692 from nextcloud/inputs-border-to-main-bgRoeland Jago Douma2017-10-103-34/+36
|\ \ \ \ \ \ \
| * | | | | | | Variable for checkboxes and name fixJohn Molakvoæ (skjnldsv)2017-10-041-14/+18
| * | | | | | | White checkboxes variableJohn Molakvoæ (skjnldsv)2017-10-041-9/+10
| * | | | | | | Fix white inputsJohn Molakvoæ (skjnldsv)2017-10-041-19/+16
| * | | | | | | Initial commitJohn Molakvoæ (skjnldsv)2017-10-043-22/+22
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-106-22/+22
| |_|/ / / / |/| | | | |