aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* implement federated group sharesBjoern Schiessle2018-07-1114-113/+274
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add setting to enable/disable federated group sharingBjoern Schiessle2018-07-113-2/+63
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2018-07-10520-2474/+3152
|
* Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-jobMorris Jobke2018-07-097-3/+98
|\ | | | | Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
| * Suppress potential SQL injection warning as they are false positivesMorris Jobke2018-07-092-0/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Add repair job for pending cron jobsMorris Jobke2018-07-094-0/+78
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Only wait for cron if fix for endless wait is includedMorris Jobke2018-07-092-3/+7
| | | | | | | | | | | | * see https://github.com/nextcloud/server/issues/9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Unlock failed cron jobs and set a high "last_checked" value to avoid ↵Morris Jobke2018-07-091-0/+9
| | | | | | | | | | | | | | | | | | continous re-check * fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored * fixed #9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #10162 from nextcloud/sabre-put-log-exceptionMorris Jobke2018-07-091-0/+1
|\ \ | | | | | | always log exceptions on dav write
| * | always log exceptions on dav writeRobin Appelman2018-07-091-0/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #10161 from ↵Morris Jobke2018-07-091-1/+2
|\ \ | |/ |/| | | | | nextcloud/bugfix/10158/correctly-handle-users-with-numeric-user-ids Correctly handle users with numeric user ids
| * Correctly handle users with numeric user idsJoas Schilling2018-07-091-1/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #10139 from chiyi4488/patch-1Morris Jobke2018-07-091-1/+1
|\ | | | | Small text error
| * Small text errorchiyi44882018-07-071-1/+1
| | | | | | Small text error
* | Merge pull request #10153 from ↵Morris Jobke2018-07-092-127/+122
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.15.1 Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotification
| * | Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotificationdependabot[bot]2018-07-092-127/+122
| | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.14.0 to 4.15.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.14.0...v4.15.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10120 from nextcloud/allow-to-disable-encryptionMorris Jobke2018-07-091-2/+6
|\ \ \ | |/ / |/| | allow to disable encryption
| * | allow to disable encryptionBjoern Schiessle2018-07-051-2/+6
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #10152 from ↵Roeland Jago Douma2018-07-092-119/+116
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.15.1 Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibility
| * | | Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibilitydependabot[bot]2018-07-092-119/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.14.0 to 4.15.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.14.0...v4.15.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #10151 from ↵Roeland Jago Douma2018-07-092-2481/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.0 Bump css-loader from 0.28.11 to 1.0.0 in /apps/updatenotification
| * | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/updatenotificationdependabot[bot]2018-07-092-2481/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.11 to 1.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #10150 from ↵Roeland Jago Douma2018-07-092-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/babel-loader-7.1.5 Bump babel-loader from 7.1.4 to 7.1.5 in /apps/accessibility
| * | | | | Bump babel-loader from 7.1.4 to 7.1.5 in /apps/accessibilitydependabot[bot]2018-07-092-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [babel-loader](https://github.com/babel/babel-loader) from 7.1.4 to 7.1.5. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v7.1.4...v7.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #10156 from nextcloud/bugfix/noid/fix-behat-versionRoeland Jago Douma2018-07-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix the behat version to 3.3.*
| * | | | Fix the behat version to 3.3.*Joas Schilling2018-07-091-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #10148 from ↵Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.15.1 Bump webpack from 4.14.0 to 4.15.1 in /settings
| * | | Bump webpack from 4.14.0 to 4.15.1 in /settingsdependabot[bot]2018-07-092-119/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.14.0 to 4.15.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.14.0...v4.15.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #10149 from ↵Roeland Jago Douma2018-07-092-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/babel-loader-7.1.5 Bump babel-loader from 7.1.4 to 7.1.5 in /settings
| * | | | Bump babel-loader from 7.1.4 to 7.1.5 in /settingsdependabot[bot]2018-07-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [babel-loader](https://github.com/babel/babel-loader) from 7.1.4 to 7.1.5. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v7.1.4...v7.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypesMorris Jobke2018-07-094-1/+30
|\ \ \ \ \ | |_|/ / / |/| | | | Add visio mimetypes
| * | | | Add visio mimetypesJoas Schilling2018-07-064-1/+30
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #10144 from ↵Roeland Jago Douma2018-07-092-959/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.0 Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2
| * | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2dependabot[bot]2018-07-092-959/+23
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.11 to 1.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #10145 from ↵Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.15.1 Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2
| * | | Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2dependabot[bot]2018-07-082-119/+116
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.14.0 to 4.15.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.14.0...v4.15.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10147 from ↵Roeland Jago Douma2018-07-092-993/+32
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.0 Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibility
| * | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibilitydependabot[bot]2018-07-082-993/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.11 to 1.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10146 from ↵Roeland Jago Douma2018-07-092-1002/+35
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/css-loader-1.0.0 Bump css-loader from 0.28.11 to 1.0.0 in /settings
| * | Bump css-loader from 0.28.11 to 1.0.0 in /settingsdependabot[bot]2018-07-082-1002/+35
|/ / | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.11 to 1.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #10116 from nextcloud/lock-negativeMorris Jobke2018-07-062-2/+20
|\ \ | | | | | | prevent lock values from going negative with memcache backend
| * | prevent lock values from going negative with memcache backendRobin Appelman2018-07-052-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | This can be caused by the code releasing more locks then it acquires, once the lock value becomes negative it's likely that it will never be able to change into an exclusive lock again. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12Roeland Jago Douma2018-07-061-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump symfony depts to 3.4.12
| * | | [3rdparty] Bump symfony depts to 3.4.12Roeland Jago Douma2018-07-061-0/+0
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailerJoas Schilling2018-07-0610-66/+85
|\ \ \ | | | | | | | | Upgrade to swiftmailer-6
| * | | Add warning to setup checks if the default mailer is still phpRoeland Jago Douma2018-07-043-1/+44
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix settings testsRoeland Jago Douma2018-07-041-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Swift to \Swift_Mailer as abstractionRoeland Jago Douma2018-07-042-33/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \Swift_Mailer handles starting the transport etc properly * Fixed tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make swift 6 compatibleRoeland Jago Douma2018-07-041-26/+16
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Kill php mail from settingsRoeland Jago Douma2018-07-043-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>