Commit graph

44679 commits

Author SHA1 Message Date
Bjoern Schiessle
5c8b26248b
let the actual federated share provider check if incoming/outgoing shares are enabled for the specific resource type
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
22d9246134
send the display name back after a federated share was received
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
27814127dd
make sure that remote url gets stored with a trailing '/'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
21b8a873d5
implement config check
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
9365fd2534
fix external manager tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
2e19213695
fix notification tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
9d145bb5dd
update tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle
5d0d33a0d4
remove unused method
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
34c4527cc4
add ocm-provider to the list of expected files
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
61485e3e60
fix check for reshare permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
ed415726d3
send RESHARE_CHANGE_PERMISSION message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
2bb1956c1f
implement RESHARE_UNDO notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications
- Don't send message to owner/sharer about revoked re-shares twice.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
a176a1f318
implement unshare notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
fab4e561f4
send reshare over OCM API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
41a1528888
implement decline share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
b7b84305a3
fix capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
c572e84ad9
detect correctly if a share was send successful
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
8889e14c7c
implement accept share notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
daba042d26
update capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
af178ef19a
check API Version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP)
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
a3948e8a12
use new API to send a federated share if possible
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
6208f250e8
check if cloud federation api is ready
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
4c8f3d6d77
add cloud federation api app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
21e64ec7f4
implement receiving of federated shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
5cfe20675d
start implementing federated sharing 2.0
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Roeland Jago Douma
22bb834c48
Merge pull request #10071 from nextcloud/apps-fix-message-translation
Fix hardcoded messages in app details view
2018-07-02 09:39:20 +02:00
Kevin Ndung'u
f4c2a81258
Fix hardcoded message in app details view 2018-07-02 00:19:16 +03:00
Michael Weimann
9bd48e7c0d Adds an info if the maintenance mode is already enabled/disabled.
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-07-01 20:56:27 +02:00
Michael Weimann
03a5856541 Disables the maintenance warning for the maintenance command itself.
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-07-01 20:54:19 +02:00
dependabot[bot]
a014129804
Merge pull request #10062 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.14.0 2018-06-30 08:15:34 +00:00
dependabot[bot]
32f6f56ae7
Bump webpack from 4.12.2 to 4.14.0 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-30 07:21:27 +00:00
dependabot[bot]
99e6191dd8
Merge pull request #10064 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.14.0 2018-06-30 07:20:21 +00:00
dependabot[bot]
31270e7cb2
Merge pull request #10063 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.14.0 2018-06-30 07:19:51 +00:00
rakekniven
b24b5bd297
Update SettingsControllerTest.php
adapted test for grammar change of URL
2018-06-30 08:51:58 +02:00
rakekniven
8370111cf4
Update SettingsController.php
Grammar fix. Uppercase URL
See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/146983238?q=issue%3Aopen
2018-06-30 08:49:44 +02:00
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger
Systemd Logger
2018-06-30 00:57:30 +02:00
Arthur Schiwon
83339ae10c
use older image for disabled redis tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-30 00:29:46 +02:00
dependabot[bot]
6e0c822112
Bump webpack from 4.12.2 to 4.14.0 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-29 20:14:52 +00:00
dependabot[bot]
57410e9e17
Bump webpack from 4.12.2 to 4.14.0 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-29 20:13:00 +00:00
Roeland Jago Douma
0f46ba43b3
Merge pull request #10061 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.14.0
Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibility
2018-06-29 22:00:48 +02:00
Roeland Jago Douma
9b6c0ac13c
Merge pull request #10041 from liamdennehy/10001/trashbin-defaults
Safe default behaviour when no users are specified on trashbin:cleanup
2018-06-29 21:39:16 +02:00
dependabot[bot]
52855d8a6a
Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-29 19:25:47 +00:00
Roeland Jago Douma
68f403cea2
Fix and extend tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 20:48:09 +02:00
Morris Jobke
501ee33554
Merge pull request #10054 from nextcloud/controls-bg
Fix controls background
2018-06-29 15:24:27 +02:00
Morris Jobke
e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only
Add option to only scan the home storage
2018-06-29 15:23:15 +02:00