Commit Graph

679 Commits

Author SHA1 Message Date
Roeland Jago Douma 22f6960f83
Allow removing federated shares of locally reshared files
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-03 15:21:04 +02:00
Nextcloud bot 8cc41974a4
[tx-robot] updated from transifex 2019-09-17 12:33:26 +00:00
Nextcloud bot 365f30b05b
[tx-robot] updated from transifex 2019-09-08 02:16:42 +00:00
Roeland Jago Douma 04ef434af0
Development is 18 now!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-05 11:26:35 +02:00
Nextcloud bot cdd491c706
[tx-robot] updated from transifex 2019-08-28 02:15:26 +00:00
Nextcloud bot 182517e0b3
[tx-robot] updated from transifex 2019-08-22 02:14:34 +00:00
Nextcloud bot b3880452bb
[tx-robot] updated from transifex 2019-08-18 02:15:40 +00:00
Nextcloud bot 67f90cb682
[tx-robot] updated from transifex 2019-08-02 02:14:30 +00:00
Nextcloud bot 0e54f59b24
[tx-robot] updated from transifex 2019-07-26 02:14:42 +00:00
Nextcloud bot 9a61d5fb72
[tx-robot] updated from transifex 2019-07-23 02:15:28 +00:00
Nextcloud bot 9249a810fb
[tx-robot] updated from transifex 2019-07-21 02:15:10 +00:00
Nextcloud bot d35f4a7645
[tx-robot] updated from transifex 2019-07-19 02:14:56 +00:00
Nextcloud bot 3d0e0f2353
[tx-robot] updated from transifex 2019-07-18 02:14:53 +00:00
Joas Schilling 55f5bc79a1
Keep the old method as a fallback and adjust the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-16 11:36:32 +02:00
Joas Schilling 44bc697a93
Update Federated sharing notifier
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-15 15:12:43 +02:00
Nextcloud bot ca76d13c78
[tx-robot] updated from transifex 2019-06-28 02:13:47 +00:00
Morris Jobke db4e8d67e0
Show share settings only if incoming federated shares are allowed
Fixes #15802

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-05-31 17:38:45 +02:00
Nextcloud bot c3f779b97d
[tx-robot] updated from transifex 2019-05-28 02:13:42 +00:00
Nextcloud bot f2885c171f
[tx-robot] updated from transifex 2019-05-22 02:13:52 +00:00
Julius Härtl 8f11d2a39b
Only show sharing section if it has content
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-05-20 18:07:24 +02:00
Nextcloud bot 4cd7900d4f
[tx-robot] updated from transifex 2019-05-10 00:13:05 +00:00
Nextcloud bot d890fb5e48
[tx-robot] updated from transifex 2019-05-09 00:12:48 +00:00
Nextcloud bot 5e8cedab9f
[tx-robot] updated from transifex 2019-05-01 00:12:41 +00:00
Nextcloud bot e4ce1f9fc1
[tx-robot] updated from transifex 2019-04-22 00:12:49 +00:00
Nextcloud bot 9302e1b8dd
[tx-robot] updated from transifex 2019-04-16 00:17:30 +00:00
Joas Schilling 4c19b3b2c6
Bump versions of server and the requirements of apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-04-11 14:02:23 +02:00
Nextcloud bot 3117be298c
[tx-robot] updated from transifex 2019-04-07 00:13:21 +00:00
Nextcloud bot 2339e94680
[tx-robot] updated from transifex 2019-04-05 00:13:16 +00:00
Nextcloud bot f7267468c0
[tx-robot] updated from transifex 2019-03-29 01:12:48 +00:00
Nextcloud bot 5ae9eda314
[tx-robot] updated from transifex 2019-03-28 01:13:21 +00:00
Nextcloud bot 86594e8c18
[tx-robot] updated from transifex 2019-03-27 11:47:47 +00:00
Nextcloud bot a541443be7
[tx-robot] updated from transifex 2019-03-26 10:41:31 +00:00
Nextcloud bot 6ea5beccd7
[tx-robot] updated from transifex 2019-03-21 01:13:49 +00:00
Nextcloud bot 785ccae622
[tx-robot] updated from transifex 2019-03-19 01:12:41 +00:00
Nextcloud bot 0930e3ecee
[tx-robot] updated from transifex 2019-03-18 01:12:27 +00:00
Nextcloud bot f8988c257c
[tx-robot] updated from transifex 2019-03-16 01:12:34 +00:00
Nextcloud bot 6fcf729545
[tx-robot] updated from transifex 2019-03-14 16:08:31 +00:00
Morris Jobke 89ed84e8b6
Fix display of i in personal settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-11 12:47:14 +01:00
Marius Blüm ab488a49d0
Add hint to user documentation (Federation)
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-11 12:47:14 +01:00
Morris Jobke 49c7799496
Merge pull request #14585 from nextcloud/ocm-mention-federation
Mention Open Cloud Mesh in Federated User Settings
2019-03-08 09:42:22 +01:00
Marius Blüm 993e15b72c
Remove G+ CSS rule (Feedback from Joas)
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 14:28:36 +01:00
Marius Blüm 6c2b80170e
Mention Open Cloud Mesh in Federated User Settings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:55:09 +01:00
Marius Blüm bdad72dfa9
Remove G+ code from Federated Files Sharing-usersettings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:46:49 +01:00
Marius Blüm 500986f30e
Remove G+ icon from Federated Files Sharing-usersettings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:45:23 +01:00
Nextcloud bot 374f89aba1
[tx-robot] updated from transifex 2019-03-01 01:12:36 +00:00
Nextcloud bot 7c68e0eae7
[tx-robot] updated from transifex 2019-02-22 01:12:10 +00:00
Nextcloud bot 5187ddcbfd
[tx-robot] updated from transifex 2019-02-09 01:12:40 +00:00
Nextcloud bot 8db2f3ec3a
[tx-robot] updated from transifex 2019-02-06 22:18:24 +00:00
Nextcloud bot 0df5110127
[tx-robot] updated from transifex 2019-02-06 11:27:29 +00:00
Nextcloud bot 4611ad5a9c
[tx-robot] updated from transifex 2019-01-26 01:12:19 +00:00
Jan-Christoph Borchardt ccc35d5566
Merge pull request #13648 from nextcloud/darktheme-fix
🕶 Dark theme fixes
2019-01-22 16:30:14 +01:00
Nextcloud bot f12b589d40
[tx-robot] updated from transifex 2019-01-19 01:12:22 +00:00
Nextcloud bot ac6ee0b8b7
[tx-robot] updated from transifex 2019-01-17 01:12:15 +00:00
blizzz 4e76b56497
Merge pull request #13634 from jospoortvliet/update-link
update URL for federation
2019-01-16 22:42:22 +01:00
Jan-Christoph Borchardt 6bc8b78918
Fix federated cloud icon sizing and dark theme compatibility
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-01-16 16:56:36 +01:00
Nextcloud bot 56ad07b85e
[tx-robot] updated from transifex 2019-01-15 01:12:14 +00:00
Nextcloud bot 8edd9b0e33
[tx-robot] updated from transifex 2019-01-14 01:12:00 +00:00
Nextcloud bot eeceb684e8
[tx-robot] updated from transifex 2018-12-30 01:12:41 +00:00
Jos Poortvliet b3cdc317e0
update URL for federation 2018-12-27 13:12:23 +01:00
Nextcloud bot 4be6aa5270
[tx-robot] updated from transifex 2018-12-20 01:11:44 +00:00
Nextcloud bot ffd2410a7e
[tx-robot] updated from transifex 2018-12-17 01:11:33 +00:00
Nextcloud bot 3068f07ad9
[tx-robot] updated from transifex 2018-12-16 01:12:32 +00:00
Nextcloud bot 5a2a78c692
[tx-robot] updated from transifex 2018-12-15 01:11:38 +00:00
Nextcloud bot 386875cabe
[tx-robot] updated from transifex 2018-12-10 01:11:36 +00:00
Nextcloud bot fba7b8b98f
[tx-robot] updated from transifex 2018-12-06 01:12:00 +00:00
Morris Jobke 7c1a5f39f7
Fix layout of "i" in admin settings of federated sharing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-12-04 17:32:13 +01:00
Nextcloud bot 68f04686a0
[tx-robot] updated from transifex 2018-11-29 01:11:34 +00:00
Nextcloud bot 5b42972648
[tx-robot] updated from transifex 2018-11-25 01:12:16 +00:00
Joas Schilling 1751c28c28
Bump versions of server and the requirements of apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-23 10:28:40 +01:00
Nextcloud bot d664a9b37b
[tx-robot] updated from transifex 2018-11-23 01:12:51 +00:00
Nextcloud bot def8af3e7e
[tx-robot] updated from transifex 2018-11-16 01:12:14 +00:00
Morris Jobke d70b010432
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again
Shorten index name of calendar changes table
2018-11-15 10:47:51 +01:00
Nextcloud bot 10c9b37461
[tx-robot] updated from transifex 2018-11-15 01:12:14 +00:00
Joas Schilling aa88254f64
Shorten index name of calendar changes table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-14 10:14:23 +01:00
Nextcloud bot 54a30a4b81
[tx-robot] updated from transifex 2018-11-06 01:12:39 +00:00
Nextcloud bot 9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Nextcloud bot f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00:00
Julius Härtl 4dda244ce2
Fix logo path in personal federated sharing settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-29 13:18:39 +01:00
Nextcloud bot 18fef12721
[tx-robot] updated from transifex 2018-10-29 01:13:07 +00:00
Nextcloud bot a9fb21f9fc
[tx-robot] updated from transifex 2018-10-23 14:54:28 +00:00
Stefan Weil c5d3febf37
Add missing variable declarations
This fixes errors from LGTM like the following one:

    Variable i is used like a local variable,
    but is missing a declaration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-10-19 20:17:55 +02:00
Nextcloud bot 7c26bbbd82
[tx-robot] updated from transifex 2018-10-10 00:13:11 +00:00
Morris Jobke ab3599155f
Merge pull request #11716 from nextcloud/bugfix/noid/use-numeric-placeholders-for-rtl-translations
Use numeric placeholders if there are multiple, so that RTL languages…
2018-10-09 16:31:52 +02:00
Joas Schilling ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-09 14:32:14 +02:00
Christoph Wurst 9af69ca2a5
Fix usage of deprecated OC.webroot
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-09 13:53:59 +02:00
Nextcloud bot 4c47ec005f
[tx-robot] updated from transifex 2018-10-07 00:12:21 +00:00
Nextcloud bot d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Nextcloud bot 2ace0df82a
[tx-robot] updated from transifex 2018-09-27 00:12:26 +00:00
Nextcloud bot 2f45045c96
[tx-robot] updated from transifex 2018-09-26 00:12:23 +00:00
Nextcloud bot bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Nextcloud bot 2a51572cc4
[tx-robot] updated from transifex 2018-09-17 00:12:30 +00:00
Nextcloud bot 3771aeb584
[tx-robot] updated from transifex 2018-09-15 00:12:09 +00:00
Nextcloud bot 6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot e9c644412c
[tx-robot] updated from transifex 2018-09-10 00:13:36 +00:00
Nextcloud bot 3a08f71981
[tx-robot] updated from transifex 2018-09-06 00:12:53 +00:00
Joas Schilling 47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Nextcloud bot 021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Nextcloud bot 4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot 8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Nextcloud bot 503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00