ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
5ace43f438
Revert "[tx-robot] updated from transifex"
...
This reverts commit 3731b2a00694d91113f1e7cc8bac1e59fc3ff45a6a89a63d2eb0bad03234
2016-07-07 11:04:08 +02:00
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
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
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
dea7b5be35
[tx-robot] updated from transifex
2016-07-02 01:54:53 -04:00
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
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
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
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
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
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
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
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
01f8434a75
Merge pull request #57 from nextcloud/fdrop-template
...
smaller files drop fixes
2016-06-13 00:14:34 +02:00
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
ca43c49709
smaller files drop fixes
...
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
14fde6650c
Merge pull request #25003 from owncloud/fix_ocs_path_response
...
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
54e2ac5713
Add text about uploaded files
2016-06-10 14:47:40 +02:00
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
c49402d266
Add some error handling
2016-06-09 21:44:54 +02:00
c268ad1597
Add PHP unit test
2016-06-09 18:29:13 +02:00
e878e786e0
Fix public upload for normal shares
2016-06-09 18:12:58 +02:00
6e99b0f59d
Make uploading possible via select and cleanup CSS
2016-06-09 17:55:26 +02:00
5fdde426eb
Add fancy layout
2016-06-09 17:55:26 +02:00
53ba111e21
Fix XSS
2016-06-09 15:15:17 +02:00
075bf73c80
Prevent access to shareinfo if share if read-only
2016-06-09 15:15:17 +02:00
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
b0dd0634e3
Bring back sharedstorage hooks
2016-06-09 14:00:02 +02:00
e7a55c4fef
handle path not being set in shared cache ( #24993 )
2016-06-09 13:59:59 +02:00
355f50bd6c
[tx-robot] updated from transifex
2016-06-09 06:16:41 +00:00
4a3c67fdb4
Bring back sharedstorage hooks
2016-06-08 08:19:32 +02:00
72c5535492
Extend unit tests
2016-06-07 15:09:26 +02:00
2e2ece753f
Fix unit tests
2016-06-07 15:09:25 +02:00
7c040c0bf9
Show the path relative to the requesting user
...
A share can only be requested by 3 'types' of people
* owner
* initiator
* recipient
So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
2016-06-07 15:09:19 +02:00
7a0254b15b
handle path not being set in shared cache ( #24993 )
2016-06-06 17:01:55 +02:00
2867d7a0f8
Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimited
...
Allow public upload when the quota is unlimited
2016-06-06 11:28:52 +02:00
Morris Jobke
Jenkins for ownCloud
Nextcloud bot
Thomas Müller
Lukas Reschke
Robin Appelman
Vincent Petry
Joas Schilling
Robin Appelman
Lukas Reschke
Arthur Schiwon
Bjoern Schiessle
Roeland Jago Douma