summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* +generateChunks()Maxence Lange2019-01-291-2/+21
| | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* 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>
* | | | | Merge pull request #13870 from nextcloud/refactor/oc-contactsmenu-bundleRoeland Jago Douma2019-01-2910-876/+879
|\ \ \ \ \ | | | | | | | | | | | | Move OC.Contactsmenu and OC.Backbone to the server bundle
| * | | | | Move OC.Contactsmenu and OC.Backbone to the server bundleChristoph Wurst2019-01-2910-876/+879
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #13855 from tomasz-grobelny/faster_file_uploadChristoph Wurst2019-01-292-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Throttle getstoragestats.php calls and allow simultaneous uploads
| * | | | Throttle getstoragestats.php calls and allow simultaneous uploadsTomasz Grobelny2019-01-272-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
* | | | | Merge pull request #13867 from nextcloud/refactor/oc-apps-bundleMorris Jobke2019-01-2810-142/+163
|\ \ \ \ \ | | | | | | | | | | | | Move OCA.Apps to the server bundle
| * | | | | Move OCA.Apps to the server bundleChristoph Wurst2019-01-2810-142/+163
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #5881 from nextcloud/command-move-calendarMorris Jobke2019-01-289-0/+899
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add command to move a calendar from an user to another
| * | | | | Handle moving calendar to an user who already has the shareThomas Citharel2019-01-164-51/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extra: * Fix @ChristophWurst style remarks * Add a Note that share links have changed when calendars has user shares (see #13603) Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix forgotten test change Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Don't check group shares if shareWithGroupMembersOnly is falseThomas Citharel2019-01-162-29/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> Remove the system user check Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | add list-calendars commandGeorg Ehrke2019-01-168-66/+519
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> Rebase and delete URI suggestion part Invite to use occ dav:list-calendars instead Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix autoload Signed-off-by: Thomas Citharel <tcit@tcit.fr> Use injection & test everything And rebase Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add test for ListCalendars and refactoring Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix indentation Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Add command to move a calendar from an user to anotherThomas Citharel2019-01-165-0/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add a basic check for displaynames in case we fail to get calendar from uri and put some sf console styles & refactor a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr> basic Tests Signed-off-by: Thomas Citharel <tcit@tcit.fr> add forgotten createNamedParameter() Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | Merge pull request #13860 from nextcloud/refactor/oc-oca-namespace-bundleMorris Jobke2019-01-287-40/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add OC and OCA namespace declarations to the bundle
| * | | | | | Add OC and OCA namespace declarations to the bundleChristoph Wurst2019-01-287-40/+68
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #13675 from imsolost/masterMorris Jobke2019-01-284-7/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixed some LGTM alerts
| * | | | | changed case on variable to match initial caseimsolost2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: imsolost <imsolost@gmail.com>
| * | | | | fixed replacement functions to catch all instances of parenthesisimsolost2019-01-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: imsolost <imsolost@gmail.com>
| * | | | | added missing variable declarationsimsolost2019-01-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: imsolost <imsolost@gmail.com>
* | | | | | Merge pull request #13859 from ↵Roeland Jago Douma2019-01-284-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-loader-15.6.2 Bump vue-loader from 15.6.0 to 15.6.2 in /settings
| * | | | | | Bump vue-loader from 15.6.0 to 15.6.2 in /settingsdependabot[bot]2019-01-284-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 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 #13839 from ↵Roeland Jago Douma2019-01-284-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.3 Bump css-vars-ponyfill from 1.16.2 to 1.16.3
| * | | | | | | Bump css-vars-ponyfill from 1.16.2 to 1.16.3dependabot[bot]2019-01-264-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.16.2 to 1.16.3. - [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases) - [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/commits/v1.16.3) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #13858 from ↵Roeland Jago Douma2019-01-283-13/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.6.2 Bump vue-loader from 15.6.0 to 15.6.2 in /apps/oauth2
| * | | | | | | | Bump vue-loader from 15.6.0 to 15.6.2 in /apps/oauth2dependabot[bot]2019-01-283-13/+13
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 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 #13818 from nextcloud/design/backgroundjobs-accessibilityMorris Jobke2019-01-281-37/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Contain background jobs options in fieldset to improve accessibility
| * | | | | | | | Contain background jobs options in fieldset to improve accessibility, fix #13795Jan-Christoph Borchardt2019-01-251-37/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | Merge pull request #13798 from nextcloud/remove-legacy-activity-stuffMorris Jobke2019-01-288-1074/+67
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Remove legacy activity stuff
| * | | | | | | | Remove legacy activity stuffJoas Schilling2019-01-248-1074/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #13838 from ↵Christoph Wurst2019-01-282-11/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.6.1 Bump vue-loader from 15.6.0 to 15.6.1 in /apps/updatenotification
| * | | | | | | | Bump vue-loader from 15.6.0 to 15.6.1 in /apps/updatenotificationdependabot[bot]2019-01-262-11/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 to 15.6.1. - [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>
* | | | | | | | Merge pull request #13834 from ↵Roeland Jago Douma2019-01-262-11/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-loader-15.6.1 Bump vue-loader from 15.6.0 to 15.6.1 in /apps/accessibility
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 21:54:10 +0000