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
Bjoern Schiessle
1394b0afb9
replace 'ownCloud' with 'Nextcloud'
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
e29835a702
[tx-robot] updated from transifex
2016-07-12 00:09:34 +00:00
Morris Jobke
d15fd5cb96
Change occurence of ownCloud ( #352 )
2016-07-11 13:49:19 +02:00
Nextcloud bot
67278d12e1
[tx-robot] updated from transifex
2016-07-11 00:09:22 +00:00
Nextcloud bot
4aae157087
[tx-robot] updated from transifex
2016-07-10 00:09:23 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex
2016-07-09 00:09:16 +00:00
Robin Appelman
d0e6fdba4d
combine if statements
2016-07-08 12:36:15 +02:00
Robin Appelman
039f730700
handle errors while getting fileinfo
2016-07-08 12:36:07 +02:00
Robin Appelman
f98cb9efa0
Fix type hinting
2016-07-08 12:35:50 +02:00
Robin Appelman
951ff0897c
hint global handlebars
2016-07-08 12:35:33 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type
2016-07-08 12:35:23 +02: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
beae00a5e5
Simplify test code and don't show anything if no date is set
2016-07-07 15:10:04 +02:00
Morris Jobke
43b26b9506
add unit tests
2016-07-07 15:10:04 +02:00
Morris Jobke
059cc1f22e
Update header during update callback
2016-07-07 15:10:03 +02:00
Morris Jobke
c809db86f5
Not set expiration date is represented as 0
2016-07-07 15:10:03 +02:00
Morris Jobke
ab3c8d4de9
add "Never" if expiration date is not set
2016-07-07 15:10:03 +02:00
Morris Jobke
b5dea82e45
Add expiration date to share by link view
2016-07-07 15:10:03 +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 e7cc8bac1e59fc3ff45a6a89a63d2eb0bad03234
2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0
[tx-robot] updated from transifex
2016-07-07 08:58:00 +00:00
Jenkins for ownCloud
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
Thomas Müller
d2d99a91a0
fix swift primary object store test ( #25281 )
...
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
Jenkins for ownCloud
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
dea7b5be35
[tx-robot] updated from transifex
2016-07-02 01:54:53 -04:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
Robin Appelman
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
Robin Appelman
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +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
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Thomas Müller
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
Vincent Petry
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Robin Appelman
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
Vincent Petry
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
Vincent Petry
a13caa0ea2
Delay files_sharing's registerMountProviders
...
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
2016-06-17 11:00:09 +02:00
Robin Appelman
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
Jenkins for ownCloud
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
