Commit graph

158 commits

Author SHA1 Message Date
Bjoern Schiessle
56d3100f44
adjust copyright notices 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
dc53788711
remove unused parameter 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
55b990b544
allow to mount public link from Nextclouds <= 9 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
5bbba490c4
move some stuff over to the federatedfilesharing app 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
2f23054b01
s/ownCloud/Nextcloud 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id 2016-07-14 16:39:48 +02:00
Björn Schießle
a0ae16aa1a
add unit tests 2016-07-14 11:22:35 +02:00
Björn Schießle
f5d0b464a7
create a real federated share if a user add a public link to his ownCloud
this way the owner sees all mounted public links and control them individually
2016-07-14 11:22:35 +02:00
Morris Jobke
2b86f1e677
Remove unneeded usage of tipsy
* tooltip is already initialized
2016-07-13 09:57:49 +02:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master
Sync master
2016-07-07 19:29:43 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex"
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Jenkins for ownCloud
34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Jenkins for ownCloud
9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud
dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Vincent Petry
ba95297c5c Merge pull request #25262 from owncloud/fed-sharing-error
Only save federated share after remote server is notified
2016-07-01 16:20:39 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Morris Jobke
b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke
5961d5aae4 Add app:check-code for already compatible apps
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
2016-06-27 16:50:10 +02:00
Robin Appelman
646c90cc4a Log reason why we removed the fed share 2016-06-27 16:38:47 +02:00
Robin Appelman
8d32e1d35b Handle exceptions thrown while trying to notify remote server of a fed share 2016-06-27 14:28:12 +02:00
Vincent Petry
f65787ffdc Merge pull request #25247 from owncloud/fed-unshare-fail
Remove a fed share from the local table before trying to notify the remote server
2016-06-27 09:58:13 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Robin Appelman
040c541138 Remove a fed share from the local table before trying to notify the remote server 2016-06-23 14:19:55 +02:00
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests 2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable 2016-06-22 10:29:40 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Bjoern Schiessle
9eaccaf2b1
s/ownCloud/Nextcloud 2016-06-20 14:20:48 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Jenkins for ownCloud
be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Jenkins for ownCloud
6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Jenkins for ownCloud
355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Jan-Christoph Borchardt
81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Jenkins for ownCloud
bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Jenkins for ownCloud
a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Jenkins for ownCloud
b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Jenkins for ownCloud
985063a7e2 [tx-robot] updated from transifex 2016-05-30 01:57:01 -04:00
Jenkins for ownCloud
c870e77546 [tx-robot] updated from transifex 2016-05-29 01:55:25 -04:00
Jenkins for ownCloud
c778fa062c [tx-robot] updated from transifex 2016-05-28 01:55:21 -04:00
Jenkins for ownCloud
a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Jenkins for ownCloud
6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare
flat federated re-share
2016-05-23 09:52:13 +02:00
Jenkins for ownCloud
88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Björn Schießle
bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle
06b6e2bff5
improved error messages 2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle
92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle
2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle
7b25839bd5
use share initiator as fall back to access the file
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Björn Schießle
8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle
5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Joas Schilling
8dc25321d3
Move FederatedFileSharing to PSR-4 2016-05-18 15:28:50 +02:00
Jenkins for ownCloud
c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Jenkins for ownCloud
5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager
The last sharing hook to be moved over.

* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
2016-04-13 15:00:12 +02:00
Roeland Douma
495a964ca2 Migrate post_groupDelete hook to share manager (#23841)
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.

* Unit tests added

Again nothing should change it is just to cleanup old code
2016-04-12 09:46:25 +02:00
Morris Jobke
929a28421a Merge pull request #23798 from owncloud/federated-unshare-background-job
re-try to send unshare notification if remote server is not available
2016-04-11 11:13:00 +02:00
Bjoern Schiessle
fbd5c28c39 re-try to send unshare notification if remote server is not available 2016-04-08 11:32:04 +02:00
Roeland Jago Douma
e0cee43cf0 Migrate post_userDelete hook to share manager
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
2016-04-04 14:15:38 +02:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Jenkins for ownCloud
5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Lukas Reschke
3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Thomas Müller
5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Lukas Reschke
88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Lukas Reschke
59028cced0 Add autodiscovery support to server-to-server sharing
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00