summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-11-166-24/+28
|
* HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events (#17955)John Molakvoæ2019-11-151-1/+1
|\ | | | | HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events
| * HTTPS link to https://en.wikipedia.org/wiki/Server-sent_eventsChristian Oliff2019-11-151-1/+1
|/ | | prevents a redirect
* [tx-robot] updated from transifexNextcloud bot2019-11-1518-96/+168
|
* Merge pull request #17942 from nextcloud/fix/noid/server-offline-app-initRoeland Jago Douma2019-11-141-0/+4
|\ | | | | pass through ServerNotAvailableException on app init
| * pass through ServerNotAvailableException on app initArthur Schiwon2019-11-141-0/+4
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #17926 from nextcloud/dav-upload-shared-lock-expiredRoeland Jago Douma2019-11-142-3/+36
|\ | | | | re-acquired expired shared locks on large file uploads
| * re-acquired expired shared locks on large file uploadsRobin Appelman2019-11-132-3/+36
| | | | | | | | | | | | | | during large file uploads, the shared lock that we get at the begining can expire leading to locked errors later on, instead of erroring, try to re-get the lock Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Revert "Remove unneeded more-white icon" (#17931)John Molakvoæ2019-11-141-0/+1
|\ \ | | | | | | Revert "Remove unneeded more-white icon"
| * | Revert "Remove unneeded more-white icon"Christoph Wurst2019-11-131-0/+1
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-11-1438-22/+108
| | |
* | | Merge pull request #17893 from RussellAult/patch-1Roeland Jago Douma2019-11-132-6/+23
|\ \ \ | |/ / |/| | Fix $redirectUri sometimes has two '?'
| * | Check getRedirectUri() for queriesRussellAult2019-11-132-6/+23
| |/ | | | | | | | | | | | | | | Resolves Issue #17885 Check getRedirectUri() for queries, and add a '&' instead of a '?' to $redirectUri if it already has them; otherwise, $redirectUri might end up with two '?'. Signed-off-by: RussellAult <russellault@users.noreply.github.com>
* | Use function to open a sidebar file (#17750)John Molakvoæ2019-11-136-21/+29
|\ \ | | | | | | Use function to open a sidebar file
| * | Use function to open a sidebar fileJohn Molakvoæ (skjnldsv)2019-11-136-21/+29
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #17832 from nextcloud/fix/noid/wfe-event-proxyingblizzz2019-11-139-25/+159
|\ \ | | | | | | relax dependency on GenericEvent, instead stay compatible with old events
| * | relax dependency on GenericEvent, instead stay compatible with old eventsArthur Schiwon2019-11-139-25/+159
| |/ | | | | | | | | | | * also fixes tagging events Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #17924 from nextcloud/enh/15664/check_quota_before_transferRoeland Jago Douma2019-11-131-2/+14
|\ \ | |/ |/| Check quota before transfer ownership
| * Check quota before transfer ownershipRoeland Jago Douma2019-11-131-2/+14
| | | | | | | | | | | | Fixes #15664 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #17898 from nextcloud/ci/7.2Roeland Jago Douma2019-11-131-140/+58
|\ \ | | | | | | Move more CI to php7.2 as minimum
| * | php7.2 minimum for 18Roeland Jago Douma2019-11-131-140/+58
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17873 from nextcloud/fix/17846/make-timeout-optRoeland Jago Douma2019-11-131-0/+1
|\ \ \ | |_|/ |/| | Make timeout a optional parameter
| * | Make timeout a optional parameterDaniel Kesselberg2019-11-091-0/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #17917 from nextcloud/bugfix/noid/editorconfigRoeland Jago Douma2019-11-131-3/+0
|\ \ \ | |_|/ |/| | Fix editorconfig - we always used 4 space tabs
| * | Remove special php setting as it is the defaultJoas Schilling2019-11-121-3/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix editorconfig - we always used 4 space tabsJoas Schilling2019-11-121-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-11-13140-248/+380
|/ /
* | Merge pull request #17909 from nextcloud/enh/change_labelRoeland Jago Douma2019-11-126-10/+10
|\ \ | | | | | | Change official => featured
| * | Change official => featuredRoeland Jago Douma2019-11-126-10/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17905 from nextcloud/bug/17447/update-searchdavRoeland Jago Douma2019-11-121-0/+0
|\ \ \ | |/ / |/| | Bump icewind/searchdav
| * | Bump icewind/searchdavDaniel Kesselberg2019-11-121-0/+0
| | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17881 from ↵Roeland Jago Douma2019-11-122-38/+180
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.7.2 Bump @babel/core from 7.6.4 to 7.7.2
| * | Bump @babel/core from 7.6.4 to 7.7.2dependabot-preview[bot]2019-11-122-38/+180
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.6.4 to 7.7.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.4...v7.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #17877 from ↵Roeland Jago Douma2019-11-122-4/+4
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/polyfill-7.7.0 Bump @babel/polyfill from 7.6.0 to 7.7.0
| * | Bump @babel/polyfill from 7.6.0 to 7.7.0dependabot-preview[bot]2019-11-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/polyfill](https://github.com/babel/babel) from 7.6.0 to 7.7.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #17882 from ↵Roeland Jago Douma2019-11-122-5/+158
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/plugin-proposal-class-properties-7.7.0 Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0
| * | | Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0dependabot-preview[bot]2019-11-112-5/+158
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.5 to 7.7.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-11-1244-338/+394
| | |
* | | Merge pull request #17876 from ↵Roeland Jago Douma2019-11-1117-172/+172
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.5.1 Bump handlebars from 4.4.5 to 4.5.1
| * | | Bump bundlesJulius Härtl2019-11-1110-51/+51
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Compile handlebarsJulius Härtl2019-11-115-114/+114
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump handlebars from 4.4.5 to 4.5.1dependabot-preview[bot]2019-11-112-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.5 to 4.5.1. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.5...v4.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #17859 from nextcloud/bugfix/app-initRoeland Jago Douma2019-11-112-49/+44
|\ \ \ \ | |/ / / |/| | | Fix app class setup warnings
| * | | Do not throw an exception for base App classJulius Härtl2019-11-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Return routes array for federation appJulius Härtl2019-11-081-48/+43
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17875 from ↵Roeland Jago Douma2019-11-112-7/+7
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/build/handlebars-4.5.1 Bump handlebars from 4.4.5 to 4.5.1 in /build
| * | Bump handlebars from 4.4.5 to 4.5.1 in /builddependabot-preview[bot]2019-11-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.5 to 4.5.1. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.5...v4.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #17895 from ↵Roeland Jago Douma2019-11-1120-265/+977
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.7.1 Bump @babel/preset-env from 7.6.3 to 7.7.1
| * | | Bump @babel/preset-env from 7.6.3 to 7.7.1dependabot-preview[bot]2019-11-1020-265/+977
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.3 to 7.7.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #17880 from ↵Roeland Jago Douma2019-11-102-25/+11
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-loader-15.7.2 Bump vue-loader from 15.7.1 to 15.7.2