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