summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2486 from nextcloud/shared-storage-maskLukas Reschke2016-12-024-8/+18
|\ | | | | apply permissions mask for shared storage
| * update testRobin Appelman2016-12-021-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * apply permissions mask for shared storageRobin Appelman2016-12-023-7/+17
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2482 from nextcloud/fix-loading-icon-sizeLukas Reschke2016-12-021-6/+6
|\ \ | | | | | | Fix loader size to 32px and 16px
| * | Fix loader size to 32px and 16pxJohn Molakvoæ (skjnldsv)2016-12-021-6/+6
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #2437 from nextcloud/update-notification-iconsMorris Jobke2016-12-025-49/+87
|\ \ \ | | | | | | | | Use an icon for the update notifications
| * | | Fix testsJoas Schilling2016-12-021-4/+11
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Update versions to 11.0.0Joas Schilling2016-12-011-39/+39
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Highlight the app name in the notificationJoas Schilling2016-12-012-1/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use the settings icon for the update notificationJoas Schilling2016-12-013-5/+11
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2490 from nextcloud/updated-gif-loaderMorris Jobke2016-12-024-0/+0
|\ \ \ \ | | | | | | | | | | Fix gif loader to fit css design, fix #1825
| * | | | Fix gif loader to fit css designJohn Molakvoæ (skjnldsv)2016-12-024-0/+0
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2480 from nextcloud/update-cache-successRoeland Jago Douma2016-12-021-3/+3
|\ \ \ \ | | | | | | | | | | only update the cache if the storage operation succeeds
| * | | | only update the cache if the storage operation succeedsRobin Appelman2016-12-021-3/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2483 from nextcloud/fix-unshare-icon-cJohn Molakvoæ2016-12-022-6/+12
|\ \ \ \ | | | | | | | | | | Fix share tab view
| * | | | Fix loader position and visibilityJohn Molakvoæ (skjnldsv)2016-12-021-4/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix popover arrowJohn Molakvoæ (skjnldsv)2016-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix unshare delete iconJohn Molakvoæ (skjnldsv)2016-12-022-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2475 from nextcloud/fix-filename-local-linkMorris Jobke2016-12-021-6/+1
|\ \ \ \ | | | | | | | | | | fix width of filename in sidebar to accommodate local link
| * | | | properly calculate the width of the name in the sidebarMorris Jobke2016-12-021-6/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | fix width of filename in sidebar to accommodate local linkJan-Christoph Borchardt2016-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #2479 from nextcloud/icon-for-empty-versionsMorris Jobke2016-12-022-2/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | add icon if no versions are available
| * | | | add icon if no versions are availableBjoern Schiessle2016-12-022-2/+10
| |/ / / | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #2471 from nextcloud/harden_files_dropLukas Reschke2016-12-026-20/+340
|\ \ \ \ | |_|/ / |/| | | Harden files drop
| * | | Install instance before running integration testsMorris Jobke2016-12-021-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add tests to droneRoeland Jago Douma2016-12-021-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add intergration testsRoeland Jago Douma2016-12-023-0/+141
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add unit testsRoeland Jago Douma2016-12-021-0/+179
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Harden files dropRoeland Jago Douma2016-12-021-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fail on MKCOL * Only take filename ignore directories * No need to parse query parameters Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2469 from nextcloud/fix-loading-icon-backgroundMorris Jobke2016-12-022-2/+8
|\ \ \ \ | | | | | | | | | | Remove white background from loading icon
| * | | | Remove white background from loading iconMorris Jobke2016-12-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allows to use the loading icon on non-white background (disabled input fields for example) * fixes #2466 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #2470 from nextcloud/fix-new-folderMorris Jobke2016-12-021-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix input field for new folder
| * | | | Increase width of new menuMorris Jobke2016-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | fix vertical sizing change of popover in new folder flowJan-Christoph Borchardt2016-12-021-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix input field for new folder - fixes #2245Morris Jobke2016-12-021-1/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2448 from nextcloud/errorreload-loginRobin Appelman2016-12-022-1/+5
|\ \ \ \ | |/ / / |/| | | only reload on errors when logged in
| * | | adjust js testsRobin Appelman2016-12-021-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | only reload on errors when logged inRobin Appelman2016-12-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2016-12-028-140/+146
|/ / /
* | | Merge pull request #2432 from nextcloud/activity-mail-languageMorris Jobke2016-12-0113-51/+132
|\ \ \ | | | | | | | | Make sure the activity emails can be sent in the users language
| * | | Adjust all implementations in the server repoJoas Schilling2016-12-0112-47/+125
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add language to the parse method for emailsJoas Schilling2016-12-011-4/+7
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2444 from nextcloud/detect-also-a-400-statusChristoph Wurst2016-12-012-1/+6
|\ \ \ | | | | | | | | Catch status code 400
| * | | Catch status code 400Lukas Reschke2016-12-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2435 from nextcloud/sidebar-preview-non-previewRoeland Jago Douma2016-12-011-3/+12
|\ \ \ \ | |_|_|/ |/| | | allow registering sidebar preview handlers for mimetypes that dont co…
| * | | allow registering sidebar preview handlers for mimetypes that dont come with ↵Robin Appelman2016-12-011-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | server side previews Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2441 from nextcloud/optimize-createParentDirectoriesRoeland Jago Douma2016-12-012-5/+81
|\ \ \ \ | |_|/ / |/| | | Prevent endless loop in \OC\Files\View::createParentDirectories
| * | | Add testsLukas Reschke2016-12-011-0/+71
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Prevent endless loop in \OC\Files\View::createParentDirectoriesLukas Reschke2016-12-011-5/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | \OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out. This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2436 from nextcloud/fix_inline_action_goneBjörn Schießle2016-12-012-8/+8
|\ \ \ | | | | | | | | We should always show permanent actions