summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14501 from nextcloud/version/noid/16.0.0-alpha-1v16.0.0alpha1Morris Jobke2019-03-041-2/+2
|\ | | | | 16.0.0 Alpha 1
| * 16.0.0 Alpha 1Morris Jobke2019-03-041-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #14480 from cowai/reconnect-db-notifyRoeland Jago Douma2019-03-041-11/+56
|\ \ | | | | | | Reconnect to DB after timeout for Notify command. Fixes #14479
| * | Correct log attributeAri Selseng2019-03-041-1/+1
| | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
| * | Added logging to Notify command.Ari Selseng2019-03-041-2/+9
| | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
| * | Reconnect to DB after timeout for Notify command. Fixes #14479Ari Selseng2019-03-031-10/+48
| | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | | Merge pull request #14514 from nextcloud/fix/no_debug_outputRoeland Jago Douma2019-03-041-3/+6
|\ \ \ | | | | | | | | Do not just write foobar
| * | | Do not just write foobarRoeland Jago Douma2019-03-041-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13871 from PLUTEX/masterMorris Jobke2019-03-041-1/+3
|\ \ \ \ | | | | | | | | | | dav: Fix handling of chunked WebDAV upload
| * | | | dav: Fix handling of chunked WebDAV uploadJan-Philipp Litza2019-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When $data is null (which can happen when $request->getBodyAsStream() returns null), the Exceptions says "copied bytes: 0, expected filesize: 0", which sounds more like success...
* | | | | Merge pull request #14499 from nextcloud/fix/svg-api/dark-modeMorris Jobke2019-03-041-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Do not cut full color on accessibility svg color invert
| * | | | | Do not cut full color on accessibility svg color invertJohn Molakvoæ (skjnldsv)2019-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #14510 from nextcloud/smb-3.1.1Morris Jobke2019-03-046-44/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | update icewind/smb to 3.1.1
| * | | | | | update icewind/smb to 3.1.1Robin Appelman2019-03-046-44/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #13401 from nextcloud/improve-lookup-server-behaviourRoeland Jago Douma2019-03-042-5/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | improve lookup server behaviour
| * | | | | | increase timespan between each retryBjoern Schiessle2019-02-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | improve lookup server behaviourBjoern Schiessle2019-01-072-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to connect to the lookup server if the lookup server was disabled by the admin or an empty lookup server URL was given Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-settingMorris Jobke2019-03-0419-649/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Remove the upload and memory setting
| * | | | | | Remove the upload and memory settingJoas Schilling2019-03-0419-649/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unneeded private method phpFileSize() * Bump autoloader * Remove setUploadLimit tests * Remove integrity check hacks for upload limit Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #12978 from tobiasKaminsky/noteOnDavMorris Jobke2019-03-042-0/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add note to dav endpoint
| * | | | | Update apps/dav/lib/Connector/Sabre/Node.phpChristoph Wurst2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: tobiasKaminsky <tobias@nextcloud.com>
| * | | | | Add note to dav endpointtobiasKaminsky2019-02-272-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
* | | | | | Merge pull request #14493 from nextcloud/tech-debt/noid/remove-php5-configMorris Jobke2019-03-044-29/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused php5 config from .htaccess
| * | | | | | Remove unused php5 config from .htaccessMorris Jobke2019-03-044-29/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #14494 from ↵Morris Jobke2019-03-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/tests/noid/make-header.feature-more-robust Make header.feature more robust by running it on apache
| * | | | | | | Make header.feature more robust by running it on apacheMorris Jobke2019-03-041-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #14484 from nextcloud/fix/users-and-groups/vue-multiselectMorris Jobke2019-03-048-423/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix/users and groups/vue multiselect
| * | | | | | | Settings build updateJohn Molakvoæ (skjnldsv)2019-03-035-366/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Use nextcloud-vue multiselectJohn Molakvoæ (skjnldsv)2019-03-033-57/+7
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #14465 from ↵Roeland Jago Douma2019-03-044-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-multiselect-2.1.4 Bump vue-multiselect from 2.1.3 to 2.1.4
| * | | | | | Bump vue-multiselect from 2.1.3 to 2.1.4dependabot[bot]2019-03-044-6/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/shentao/vue-multiselect/releases) - [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.3...2.1.4) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #14467 from ↵John Molakvoæ2019-03-0418-58/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-and-vue-template-compiler-2.6.8 Bump vue and vue-template-compiler
| * | | | | | BuildJohn Molakvoæ (skjnldsv)2019-03-0416-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Bump vue and vue-template-compilerdependabot[bot]2019-03-022-23/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) and [vue-template-compiler](https://github.com/vuejs/vue). These dependencies needed to be updated together. Updates `vue` from 2.6.7 to 2.6.8 - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.6.7...v2.6.8) Updates `vue-template-compiler` from 2.6.7 to 2.6.8 - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.6.7...v2.6.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | | Merge pull request #14468 from nextcloud/fix/inline-input-confirm-buttonRoeland Jago Douma2019-03-043-12/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix default input element height
| * | | | | Fix default input element heightJohn Molakvoæ (skjnldsv)2019-03-023-12/+12
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #14488 from nextcloud/fix/dav/has-photoMorris Jobke2019-03-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix dav has-photo plugin extend
| * | | | | Fix dav has-photo plugin extendJohn Molakvoæ (skjnldsv)2019-03-031-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #14489 from nextcloud/fix/accessibility/l10nMorris Jobke2019-03-031-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Add accessibility translations
| * | | | Add accessibility translationsJohn Molakvoæ (skjnldsv)2019-03-031-0/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #14457 from nextcloud/refactor/auth-tokens-initial-stateRoeland Jago Douma2019-03-0110-145/+324
|\ \ \ \ | | | | | | | | | | Load auth tokens with the initial state API
| * | | | Load auth tokens with the initial state APIChristoph Wurst2019-03-0110-145/+324
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #14448 from mzamot/masterRoeland Jago Douma2019-03-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Convert value of timestamp metadata key in swift files_external
| * | | | Convert timestamp key value of metadata in Swift files_externalMichael Zamot2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: apps/files_external/lib/Lib/Storage/Swift.php Signed-off-by: Michael Zamot <michael@zamot.io> Convert value of timestamp metadata key in swift files_external to string
* | | | | Merge pull request #11871 from nextcloud/feature/11015/collaboration-resourcesRoeland Jago Douma2019-03-0174-1295/+3952
|\ \ \ \ \ | | | | | | | | | | | | Collaboration resources
| * | | | | Remove unneeded filesJulius Härtl2019-03-012-6281/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Add bundled filesJulius Härtl2019-03-0110-25/+445
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fix files_external testsJoas Schilling2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fetch node and filename also if access cache was usedJulius Härtl2019-03-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fix testsJulius Härtl2019-03-015-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>