aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a key parameter to the new initial state APIChristoph Wurst2019-01-3012-46/+160
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #13903 from ↵Roeland Jago Douma2019-01-3012-340/+371
|\ | | | | | | | | nextcloud/refactor/ocp-appconfig-comments-whatsnew-bundle Move OCP.AppConfig, OCP.Comments and OCP.WhatsNew to the server bundle
| * Move OCP.AppCOnfig, OCP.Comments and OCP.WhatsNew to the server bundleChristoph Wurst2019-01-3012-340/+371
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13908 from ↵Morris Jobke2019-01-303-6/+6
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-loader-15.6.2 Bump vue-loader from 15.6.1 to 15.6.2 in /apps/accessibility
| * | Bump vue-loader from 15.6.1 to 15.6.2 in /apps/accessibilitydependabot[bot]2019-01-303-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.1 to 15.6.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #13907 from ↵dependabot[bot]2019-01-303-6/+6
|\ \ \ | |_|/ |/| | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.6.2
| * | Bump vue-loader from 15.6.1 to 15.6.2 in /apps/updatenotificationdependabot[bot]2019-01-303-6/+6
| |/ | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.1 to 15.6.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13891 from nextcloud/remove-external-failure-notificationMorris Jobke2019-01-301-18/+0
|\ \ | | | | | | Remove warning in case of external storage error
| * | Remove warning in case of external storage errorJohn Molakvoæ (skjnldsv)2019-01-291-18/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #13412 from nextcloud/forward-password-policyRoeland Jago Douma2019-01-301-1/+5
|\ \ \ | | | | | | | | forward error message from password policy
| * | | forward error message from password policyRobin Appelman2019-01-071-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #12364 from tomasz-grobelny/file_range_selectJohn Molakvoæ2019-01-304-26/+124
|\ \ \ \ | |_|_|/ |/| | | Ability to select file ranges with mouse or touchscreen
| * | | Add more accessible method of selecting file rangesTomasz Grobelny2019-01-244-26/+124
| | | | | | | | | | | | | | | | Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
* | | | Merge pull request #13237 from rcdailey/nfs-write-checksRoeland Jago Douma2019-01-301-7/+15
|\ \ \ \ | | | | | | | | | | Improve data directory write checking for NFS mounts
| * | | | Improve data directory write checking for NFS mountsRobert Dailey2019-01-241-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `is_writable()` fails, fall back to logic that attempts to create a file and then checks if it exists. If this check fails, an error occurs as it did before. Discussion on this solution was found here: https://help.nextcloud.com/t/write-errors-for-nfs-mount/23328 Fixes #7124 Signed-off-by: Robert Dailey <rcdailey@gmail.com>
* | | | | Merge pull request #13752 from rummatee/issue7629Roeland Jago Douma2019-01-301-0/+1
|\ \ \ \ \ | | | | | | | | | | | | fix opacity for add-new-folder button
| * | | | | fix opacity for add-new-folder buttonFlorian Schunk2019-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
* | | | | | Merge pull request #13830 from nextcloud/fix/shared_versionsRoeland Jago Douma2019-01-301-2/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow shared versions again in legacy backend
| * | | | | | Allow shared versions again in legacy backendRoeland Jago Douma2019-01-251-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that the versions in the legacy backend are shared again we have to check the storage of a file. Since all shared files are still on the owners storage. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #13897 from ↵Roeland Jago Douma2019-01-305-45/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-updating-the-password-of-a-link-share-when-passwords-are-enforced Fix updating the password of a link share when passwords are enforced
| * | | | | | | Fix updating the password of a link share when passwords are enforcedDaniel Calviño Sánchez2019-01-295-45/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password input was shown in the popup menu when passwords were not enforced, or when they were enforced but no password was set, which prevented updating/changing the password once set. As the password input should be shown too when password are enforced and a password is set no condition is needed, so now the password input is always shown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | Merge pull request #13886 from nextcloud/trashbin-original-location-fallbackRoeland Jago Douma2019-01-301-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add fallback for trashbin original location
| * | | | | | | | add fallback for trashbin original locationRobin Appelman2019-01-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #13646 from nextcloud/enh/13488/initialstateRoeland Jago Douma2019-01-3020-21/+223
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow apps to register an initial state
| * | | | | | | | | Provide initial stateRoeland Jago Douma2019-01-2920-21/+223
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocpRoeland Jago Douma2019-01-2910-135/+156
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose subadmin to OCP
| * | | | | | | | | Expose subadmin to OCPRoeland Jago Douma2019-01-2910-135/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | Merge pull request #13881 from nextcloud/refactor/jquery-plugins-bundleRoeland Jago Douma2019-01-2926-1047/+1449
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move jQuery plugins into modules and add them to the bundle
| * | | | | | | | | | Move jQuery plugins into modules and add them to the bundleChristoph Wurst2019-01-2926-1047/+1449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | | Merge pull request #13869 from ↵Roeland Jago Douma2019-01-293-3/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enh/clean_pending_2fa_session_on_password_change Clean pending 2FA authentication on password reset
| * | | | | | | | | | Clean pending 2FA authentication on password resetRoeland Jago Douma2019-01-293-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a password is reste we should make sure that all users are properly logged in. Pending states should be cleared. For example a session where the 2FA code is not entered yet should be cleared. The token is now removed so the session will be killed the next time this is checked (within 5 minutes). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | | Merge pull request #13883 from nextcloud/fix-dropping-a-folder-on-a-folder-rowRoeland Jago Douma2019-01-291-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Fix dropping a folder on a folder row
| * | | | | | | | | | Fix dropping a folder on a folder rowDaniel Calviño Sánchez2019-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the uploaded files have a relative path (that is, when a folder is uploaded) it is first ensured that all the parent folders exist, which is done by trying to create them. When a folder is created in the currently opened folder the file list is updated and a row for the new folder is added. However, this was done too when the folder already existed, which caused the previous row to be removed and a new one added to replace it. For security reasons, some special headers need to be set in requests; this is done automatically for jQuery by handling the "ajaxSend" event in the document. In the case of DAV requests, if the headers are not set the server rejects the request with "CSRF check not passed". When a file or folder is dropped on a folder row the jQuery upload events are chained from the initial drop event, which has the row as its target. In order to upload the file jQuery performs a request, which triggers the "ajaxSend" event in the row; this event then bubbles up to the document, which is then handled by adding the special headers to the request. However, when a folder was dropped on a folder row that folder row was removed when ensuring that the folder exists. The jQuery upload events were still triggered on the row, but as it had been removed it had no parent nodes, and thus the events did not bubble up. Due to this the "ajaxSend" event never reached the document when triggered on the removed row, the headers were not set, and the upload failed. All this is simply fixed by not removing the folder row when trying to create it if it existed already. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | | | | Merge pull request #13865 from nextcloud/fix/noid/ldap-pagedsearch-multiplebasesMorris Jobke2019-01-294-7/+52
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix paged search with multiple bases (LDAP)
| * | | | | | | | | | | iterate over bases instead of doing parallel searchArthur Schiwon2019-01-281-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parallel search is not compatible with paged search, but the letter is usually always applied. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | | | integration test: pages search scenario with multiple basesArthur Schiwon2019-01-282-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | | | typoArthur Schiwon2019-01-281-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | | Merge pull request #13843 from nextcloud/bugfix/11852-add-icon-caldavMorris Jobke2019-01-291-32/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ico as avatar
| * | | | | | | | | | | Use proper mime type for icoDaniel Kesselberg2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | | | | Add ico as avatarDaniel Kesselberg2019-01-281-32/+32
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | | | Merge pull request #13866 from nextcloud/s3-multipart-uploaderRoeland Jago Douma2019-01-292-5/+33
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | always use multipart uploader for s3 uploads
| * | | | | | | | | | always use multipart uploader for s3 uploadsRobin Appelman2019-01-282-5/+33
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the multipart uploader handles non seekable streams while `upload` does not Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | Merge pull request #13878 from nextcloud/refactor/oc-appconfig-eventsource-l10nMorris Jobke2019-01-299-92/+130
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move OC.AppConfig, OC.EventSource and OC.L10N to the server bundle
| * | | | | | | | | | Move OC.L10n to the server bundleChristoph Wurst2019-01-297-36/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | | | | Move OC.EventSource to the server bundleChristoph Wurst2019-01-296-56/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | | | | Move OC.AppConfig to the server bundle and add a deprecation verionChristoph Wurst2019-01-296-14/+40
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | Merge pull request #10874 from ↵John Molakvoæ2019-01-292-1/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/10859/clear-localstorage-on-logout Clears the local storage after logout
| * | | | | | | | | | Clears the local storage after logoutMichael Weimann2019-01-292-1/+10
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | | | | | | Merge pull request #13791 from nextcloud/no-whiteversion-for-shadowed-iconsJohn Molakvoæ2019-01-291-5/+18
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Do not generate dark version of the view-icons w/ shadows
| * | | | | | | | | Do not generate dark version of the view-icons w/ shadowsJohn Molakvoæ (skjnldsv)2019-01-241-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>