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
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