Commit Graph

44581 Commits

Author SHA1 Message Date
Bjoern Schiessle f5a816262c
accept/decline group shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:46 +02:00
Bjoern Schiessle 7a48a85dca
fix notification when a group share is received
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:45 +02:00
Bjoern Schiessle 4c00c80a83
translate nextcloud share types to OCM share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:45 +02:00
Bjoern Schiessle 8bc0de3469
log error messgage
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:44 +02:00
Bjoern Schiessle b23032e4c5
implement federated group shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:44 +02:00
Bjoern Schiessle c8631d607e
add setting to enable/disable federated group sharing
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:41 +02:00
Nextcloud bot a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Morris Jobke ed6352af0e
Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-job
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
2018-07-09 15:49:41 +02:00
Morris Jobke 5244501f0f
Merge pull request #10162 from nextcloud/sabre-put-log-exception
always log exceptions on dav write
2018-07-09 15:48:58 +02:00
Morris Jobke 6afb8af4d1
Merge pull request #10161 from nextcloud/bugfix/10158/correctly-handle-users-with-numeric-user-ids
Correctly handle users with numeric user ids
2018-07-09 15:38:16 +02:00
Morris Jobke 79801ad263
Suppress potential SQL injection warning as they are false positives
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:55:47 +02:00
Morris Jobke 8a64433ec9
Add repair job for pending cron jobs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:53:37 +02:00
Morris Jobke 8b1084adfe
Only wait for cron if fix for endless wait is included
* see https://github.com/nextcloud/server/issues/9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:53:37 +02:00
Morris Jobke a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid 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>
2018-07-09 14:51:02 +02:00
Robin Appelman 8399d6070e
always log exceptions on dav write
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-09 14:25:54 +02:00
Joas Schilling 1ca075a113
Correctly handle users with numeric user ids
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-09 14:22:10 +02:00
Morris Jobke ecbc1b10ae
Merge pull request #10139 from chiyi4488/patch-1
Small text error
2018-07-09 13:58:43 +02:00
Morris Jobke e2320e3ded
Merge pull request #10153 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.15.1
Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotification
2018-07-09 13:57:58 +02:00
Morris Jobke 103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption
allow to disable encryption
2018-07-09 13:39:57 +02:00
dependabot[bot] ee30530bde
Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotification
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>
2018-07-09 11:09:30 +00:00
Roeland Jago Douma a85dc8585b
Merge pull request #10152 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.15.1
Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibility
2018-07-09 13:06:32 +02:00
Roeland Jago Douma 97ee31e9f0
Merge pull request #10151 from 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
2018-07-09 13:06:03 +02:00
Roeland Jago Douma e7dd94a81a
Merge pull request #10150 from 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
2018-07-09 13:05:41 +02:00
dependabot[bot] 0da2178d19
Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibility
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>
2018-07-09 10:20:04 +00:00
Roeland Jago Douma b9caed2c39
Merge pull request #10156 from nextcloud/bugfix/noid/fix-behat-version
Fix the behat version to 3.3.*
2018-07-09 12:19:48 +02:00
Roeland Jago Douma d19955d5fb
Merge pull request #10148 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.15.1
Bump webpack from 4.14.0 to 4.15.1 in /settings
2018-07-09 12:18:07 +02:00
Joas Schilling e3b5ed602c
Fix the behat version to 3.3.*
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-09 11:10:25 +02:00
dependabot[bot] c8b9a89da7
Bump babel-loader from 7.1.4 to 7.1.5 in /apps/accessibility
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>
2018-07-09 08:53:06 +00:00
dependabot[bot] cf574ce69d
Bump css-loader from 0.28.11 to 1.0.0 in /apps/updatenotification
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>
2018-07-09 08:52:58 +00:00
Roeland Jago Douma 3067dfe49e
Merge pull request #10149 from nextcloud/dependabot/npm_and_yarn/settings/babel-loader-7.1.5
Bump babel-loader from 7.1.4 to 7.1.5 in /settings
2018-07-09 10:51:17 +02:00
Morris Jobke 732394396b
Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypes
Add visio mimetypes
2018-07-09 10:40:10 +02:00
dependabot[bot] 873840a110
Bump webpack from 4.14.0 to 4.15.1 in /settings
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>
2018-07-09 08:32:09 +00:00
Roeland Jago Douma 89bd037e07
Merge pull request #10144 from 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
2018-07-09 10:31:11 +02:00
Roeland Jago Douma 07e501a911
Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.15.1
Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2
2018-07-09 10:29:44 +02:00
dependabot[bot] b587aa5f79
Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2
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>
2018-07-09 07:49:05 +00:00
dependabot[bot] 7a74483016
Bump babel-loader from 7.1.4 to 7.1.5 in /settings
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>
2018-07-09 07:48:59 +00:00
Roeland Jago Douma f0b356620f
Merge pull request #10147 from 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
2018-07-09 09:46:42 +02:00
Roeland Jago Douma 5d75633814
Merge pull request #10146 from nextcloud/dependabot/npm_and_yarn/settings/css-loader-1.0.0
Bump css-loader from 0.28.11 to 1.0.0 in /settings
2018-07-09 09:46:16 +02:00
dependabot[bot] 6c7ff83a0c
Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibility
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>
2018-07-08 09:36:18 +00:00
dependabot[bot] f346f96206
Bump css-loader from 0.28.11 to 1.0.0 in /settings
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>
2018-07-08 09:36:10 +00:00
dependabot[bot] 1c8ba34655
Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2
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>
2018-07-08 09:36:05 +00:00
chiyi4488 e4c583c186
Small text error
Small text error
2018-07-07 01:26:07 +08:00
Joas Schilling 5541d3dd84
Add visio mimetypes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-06 15:16:21 +02:00
Morris Jobke 422c805e26
Merge pull request #10116 from nextcloud/lock-negative
prevent lock values from going negative with memcache backend
2018-07-06 14:50:18 +02:00
Roeland Jago Douma 3c9b12139e
Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12
[3rdparty] Bump symfony depts to 3.4.12
2018-07-06 14:06:42 +02:00
Roeland Jago Douma 8f12c9d85d
[3rdparty] Bump symfony depts to 3.4.12
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-06 13:18:10 +02:00
Joas Schilling 3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
Morris Jobke 8969e100a0
Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templates
Add locale to templates
2018-07-06 10:15:51 +02:00
Roeland Jago Douma 7b848368d5
Add locale to templates
It was already added to the user template but we should add it to all
templates. Else apps that want the locale but use special templating (hi
richdocuments!) will fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-06 09:23:01 +02:00
Roeland Jago Douma de9ab49558
Merge pull request #10119 from nextcloud/bugfix/noid/fix-remnants-of-refactoring
Fix remnants of refactoring
2018-07-05 20:26:00 +02:00