Morris Jobke
|
b6397ef73a
|
Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
|
2016-06-28 09:02:03 +02: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 |
|
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 |
|