Morris Jobke
2bb031ecc6
Merge pull request #1606 from nextcloud/search-detail
...
search design details
2016-10-18 13:48:01 +02:00
Nextcloud bot
943d9737e4
[tx-robot] updated from transifex
2016-10-18 00:06:51 +00:00
Nextcloud bot
00ed841559
[tx-robot] updated from transifex
2016-10-15 00:06:56 +00:00
Robin Appelman
2de59d8a2a
remove unneeded unlock
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
Robin Appelman
ab10a54836
remove duplicate trait
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:38 +02:00
Robin Appelman
f63f0aa1ae
get node by path as fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman
9754724c8b
fix getting recipient share in ocs api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman
7d1e800c15
fix share tests not passing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
Robin Appelman
1b3b816a0a
re-use the share node while formating if we already have it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
Robin Appelman
3845d4ec9a
more robust test setup
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman
7ce68ce6ac
phpunit is weird
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman
37eded7e7c
Always unlock node after trying to create a share
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
Nextcloud bot
3f40bb69f8
[tx-robot] updated from transifex
2016-10-10 00:06:58 +00:00
Nextcloud bot
9fc3209d2c
[tx-robot] updated from transifex
2016-10-09 00:06:49 +00:00
Nextcloud bot
0beecbf2c5
[tx-robot] updated from transifex
2016-10-08 00:06:50 +00:00
Lukas Reschke
f2b1a1781c
Merge pull request #1568 from nextcloud/test-running-coverage-also-for-db
...
[Test] Generate coverage for DB group
2016-10-05 14:37:25 +02:00
Lukas Reschke
a1f5364d7f
Generate coverage for quick DB tests
...
This adds the "QUICKDB" group which excludes some tests that abuse unit tests as integration tests as displayed in https://github.com/nextcloud/server/issues/1626
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 13:55:44 +02:00
Joas Schilling
671f16f706
Add icons to activity navigation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
Christoph Wurst
96af627bb7
fix sharing icon's alignment and add padding to the unshare icon
2016-10-03 09:35:54 +02:00
Nextcloud bot
07a1be2e06
[tx-robot] updated from transifex
2016-10-03 00:12:47 +00:00
Nextcloud bot
6297d201df
[tx-robot] updated from transifex
2016-10-02 00:16:25 +00:00
Nextcloud bot
da03018add
[tx-robot] updated from transifex
2016-10-01 00:08:23 +00:00
Nextcloud bot
99076a8c0d
[tx-robot] updated from transifex
2016-09-30 00:08:13 +00:00
Lukas Reschke
498b7399c1
Inject IHTTPClientService
...
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…
See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference
Pretty similar to https://github.com/nextcloud/server/pull/1565
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:26:20 +02:00
Lukas Reschke
0f321fe116
Merge pull request #1534 from nextcloud/svg-optimization
...
Svgo optimization
2016-09-28 23:05:48 +02:00
Morris Jobke
f4eee1d3a5
Merge pull request #1512 from nextcloud/share-alttext
...
Display "Share" alt text for share action icon (#26158 )
2016-09-28 20:44:15 +02:00
skjnldsv
71830b285c
Svgo optimization
...
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
Joas Schilling
fc65093694
Merge pull request #1460 from nextcloud/fed-share-retry
...
[upstream] Fix fed share test call to return proper result
2016-09-26 13:59:28 +02:00
Vincent Petry
f07d146644
Display "Share" alt text for share action icon ( #26158 )
...
Downstreaming of https://github.com/owncloud/core/pull/26158
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 10:30:11 +02:00
Nextcloud bot
a086011e00
[tx-robot] updated from transifex
2016-09-25 00:09:40 +00:00
Nextcloud bot
b30c79b63c
[tx-robot] updated from transifex
2016-09-23 00:09:45 +00:00
Nextcloud bot
6a873acf46
[tx-robot] updated from transifex
2016-09-22 00:11:32 +00:00
Vincent Petry
118c9d58fe
Fix fed share test call to return proper result
...
Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
2016-09-20 12:11:26 +02:00
Nextcloud bot
f4a4578f0d
[tx-robot] updated from transifex
2016-09-19 00:09:33 +00:00
Nextcloud bot
cb6e16ab5c
[tx-robot] updated from transifex
2016-09-17 00:10:14 +00:00
Nextcloud bot
9fa288f12b
[tx-robot] updated from transifex
2016-09-16 00:09:34 +00:00
Nextcloud bot
4fdee00c27
[tx-robot] updated from transifex
2016-09-15 00:12:37 +00:00
Roeland Jago Douma
56d37e27bc
Fix tests
2016-09-13 09:40:59 +02:00
Vincent Petry
fb52b1af67
Allow increasing permissions for share owner
...
In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
2016-09-13 09:40:59 +02:00
Jan-Christoph Borchardt
a45cfbc2d2
search design details
2016-09-09 18:01:00 +02:00
Roeland Jago Douma
ba104233b0
Move remote_shares OCS endpoint to AppFramework
2016-09-09 07:40:33 +02:00
Nextcloud bot
f5aafdc897
[tx-robot] updated from transifex
2016-09-09 00:09:31 +00:00
Morris Jobke
c16aefcff5
Merge pull request #1317 from nextcloud/add-sharing-disclaimer
...
Adding a optional disclaimer to the anonymous upload page
2016-09-08 21:18:28 +02:00
Morris Jobke
5ac26d12f0
Merge pull request #1247 from nextcloud/storage-id-global-cache
...
more efficient querying of numeric storage ids
2016-09-08 21:09:14 +02:00
Lukas Reschke
268c5a0aa0
Adjust test
2016-09-08 20:34:04 +02:00
Lukas Reschke
9a2ae2fe7d
Fix tests
2016-09-08 20:11:21 +02:00
Morris Jobke
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
Robin Appelman
9adf78c155
dont show shares you own in "shared with you"
2016-09-07 18:38:08 +02:00
Robin Appelman
e8e950a4d2
more efficient querying of numeric storage ids
2016-09-07 17:22:40 +02:00
Joas Schilling
7c0951244a
Deprecate getEditionString()
2016-09-06 16:05:28 +02:00
Roeland Jago Douma
c629761fea
Fix getMock files_sharing
2016-09-06 09:29:27 +02:00
Nextcloud bot
8b484eedf0
[tx-robot] updated from transifex
2016-09-05 00:09:10 +00:00
Nextcloud bot
fc02c4a980
[tx-robot] updated from transifex
2016-09-04 00:09:21 +00:00
Nextcloud bot
e7f618ef14
[tx-robot] updated from transifex
2016-09-03 00:09:24 +00:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex
2016-09-01 00:09:24 +00:00
Roeland Jago Douma
a0af513a4a
Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
...
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
Vincent Petry
423378ea17
Added closeCursor in SharedMount numeric id
2016-08-30 19:49:31 +02:00
Vincent Petry
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:49:23 +02:00
Vincent Petry
ec9fd67bc5
Allow space for federated share id search
2016-08-30 11:11:59 +02:00
Thomas Müller
6c365cb06d
A shared storage is never a home storage - fixes #25582
2016-08-29 14:13:26 +02:00
Roeland Jago Douma
2fdda01b4b
Sharee API to AppFramework
...
* Move to OCSController
* Move to Controller folder
* Use automatic DI
* Use function parameters
* Updated tests
2016-08-26 11:36:09 +02:00
Roeland Jago Douma
cae87d028d
Fix tests
2016-08-24 21:30:42 +02:00
Roeland Jago Douma
a1ed8207e9
HTTPHelper is deprecated
...
Use the IClientService instead
2016-08-24 21:30:39 +02:00
Roeland Jago Douma
352d22e473
Do not error on NotFoundException
...
Since this exception can be thrown when a shared file is in the
trashbin there is no need to spam the log like crazy.
Fixes #938
2016-08-24 08:18:08 +02:00
Robin Appelman
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
Robin Appelman
1e7c108bff
handle failed shares
2016-08-22 12:32:39 +02:00
Robin Appelman
3ed01e8459
Lazy init shared storage
2016-08-22 12:27:56 +02:00
Robin Appelman
95570d607c
reuse existing root id
2016-08-22 12:27:20 +02:00
Roeland Jago Douma
fda4241dfb
Cleanup Tests
2016-08-17 20:45:29 +02:00
Roeland Jago Douma
af074eb2b7
Move updateShare and getShares over to use proper parameters
...
* Update tests
2016-08-17 20:45:29 +02:00
Roeland Jago Douma
22e23f3045
Use parameters in createShare
...
* Fix tests
2016-08-17 20:45:27 +02:00
Morris Jobke
ec4d127e58
Merge pull request #905 from nextcloud/invisible_icons
...
Fix icons on App page in FF
2016-08-17 17:24:16 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex
2016-08-17 13:30:52 +00:00
Roeland Jago Douma
ba4633b165
Add viewBox to app icons
...
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
2016-08-17 15:23:51 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex
2016-08-17 00:09:19 +00:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex
2016-08-16 00:10:47 +00:00
Roeland Jago Douma
396678c9ce
Merge pull request #855 from nextcloud/files_drop_capability
...
Add files drop capability for clients
2016-08-15 15:38:35 +02:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex
2016-08-15 00:12:16 +00:00
Roeland Jago Douma
9daf41e05a
Add files drop capability for clients
2016-08-13 14:02:09 +02:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex
2016-08-13 00:13:29 +00:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex
2016-08-12 00:10:18 +00:00
Nextcloud bot
f68f1d5f37
[tx-robot] updated from transifex
2016-08-11 12:08:42 +00:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex
2016-08-11 00:14:12 +00:00
Roeland Jago Douma
ba922c9f73
Merge pull request #807 from nextcloud/ocs_dataresponse
...
OCSController requires DataResponse
2016-08-10 22:36:25 +02:00
Lukas Reschke
67d016833d
Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
...
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
Björn Schießle
219f36d261
Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id
...
get shared storage storage id without setting up the storage
2016-08-10 14:56:41 +02:00
Roeland Jago Douma
4006763f5b
Move the Share20OCS code over to use the proper DataResponse
2016-08-10 12:40:32 +02:00
Vincent Petry
412b5c5407
Store the shared propagator instance
...
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex
2016-08-10 00:09:59 +00:00
Robin Appelman
a999420c75
get shared storage storage id without setting up the storage
2016-08-09 15:52:13 +02:00
Nextcloud bot
3a26def7cf
[tx-robot] updated from transifex
2016-08-09 00:10:11 +00:00
Joas Schilling
352e8b3c79
More casing
2016-08-08 16:45:40 +02:00
Joas Schilling
dae6432ae7
Increment the versions and adjust the capitilization
2016-08-08 16:45:40 +02:00
Lukas Reschke
70eef2a82e
Merge pull request #445 from nextcloud/ocs_share_to_appframework
...
OCS Share API to appframework
2016-08-08 14:59:59 +02:00
Nextcloud bot
b80e3e70e5
[tx-robot] updated from transifex
2016-08-06 00:10:17 +00:00
Roeland Jago Douma
0556e40d3e
Fix tests
2016-08-05 14:17:32 +02:00
Roeland Jago Douma
d9418c105e
Add OCSShareAPIMiddleware tests
2016-08-05 14:17:32 +02:00
Roeland Jago Douma
4504d7f5e9
DataResponse required ['data' => DATA]
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
7fdc2f32fa
More exceptions
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
3a31b2875b
Add OCSShareAPIMiddleware
...
* This will cleanup the locks after each request
* Move check for enabled share api to the middleware
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
8b160077f1
Throw OCSNotFoundExceptions
2016-08-05 14:17:25 +02:00
Roeland Jago Douma
54f21bccdf
Remove unneeded wrapper
2016-08-05 14:17:25 +02:00
Roeland Jago Douma
a32caa4904
Convert Share API to use the AppFramework
2016-08-05 14:17:25 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex
2016-08-05 00:10:09 +00:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex
2016-08-04 00:11:51 +00:00
Vincent Petry
2404f6a5a7
Make share target consistent when grouping group share with user share
...
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.
To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.
This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
2016-08-03 10:16:28 +02:00
Vincent Petry
0bddaa23b0
Added more tests for sharing's MountProvider
2016-08-03 10:16:28 +02:00
Vincent Petry
714d7ec936
Improved share grouping readability + fixed test
2016-08-03 10:16:28 +02:00
Roeland Jago Douma
04d5465228
Group shares with same source and target
...
Fixes #24575
Note that this is a very limited solution and eventually we want smarter
merging!
2016-08-03 10:16:28 +02:00
Nextcloud bot
0874460e48
[tx-robot] updated from transifex
2016-08-03 00:11:12 +00:00
Joas Schilling
4e5fb74773
Do not allow to delete/update group shares as a group member
2016-08-02 10:50:35 +02:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex
2016-08-01 00:10:15 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex
2016-07-30 00:11:16 +00:00
Jan-Christoph Borchardt
696ff90cbe
Merge pull request #625 from nextcloud/video-container-size
...
up the minimum size of the public share video a bit, use 16/9 ratio
2016-07-29 15:36:30 +02:00
Jan-Christoph Borchardt
748745d381
up the minimum size of the public share video a bit, use 16/9 ratio, fix #603
2016-07-29 10:47:00 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex
2016-07-29 00:09:49 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex
2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex
2016-07-23 00:09:06 +00:00
Joas Schilling
7400ff05ac
Also increase the min version
2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b
bumb compatible app versions for core apps
2016-07-22 13:04:23 +02:00
Joas Schilling
03cb588ea9
Merge pull request #500 from nextcloud/bump_version
...
Bump version
2016-07-22 10:03:42 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex
2016-07-22 00:10:05 +00:00
Joas Schilling
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions
2016-07-21 15:50:30 +02:00
Morris Jobke
dc5608d15a
Merge pull request #477 from nextcloud/fix-layout-public-upload
...
move closing div to the right place
2016-07-21 09:28:35 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex
2016-07-21 00:09:07 +00:00
Bjoern Schiessle
1ab1e000e8
move closing div to the right place
2016-07-20 18:34:32 +02:00
Thomas Müller
4d67429cf0
Use an icon to set the email instead of a button with string
2016-07-20 15:07:46 +02:00
Thomas Müller
daaa3ded8d
Add clipboard button to public share link
2016-07-20 15:07:41 +02:00
Nextcloud bot
4a963c21ff
[tx-robot] updated from transifex
2016-07-19 00:09:00 +00:00
Björn Schießle
f7d26e4aa5
Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
...
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex
2016-07-18 14:08:51 +00:00
Roeland Jago Douma
773250be24
Cleanup coding style
2016-07-18 13:35:35 +02:00
Roeland Jago Douma
1c5e082ee1
Add eventdispatcher to public link view
2016-07-18 13:35:35 +02:00
Roeland Jago Douma
ea3035aa0e
Move JS inclusion to Controller
...
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
Roeland Jago Douma
ff54141639
Move SetupFromToken to ShareManager
2016-07-18 10:53:49 +02:00
Morris Jobke
40328114f9
Merge pull request #379 from nextcloud/create_federated_share_on_mount
...
Create federated share on mount
2016-07-18 09:22:48 +02:00
Nextcloud bot
d6907fe84d
[tx-robot] updated from transifex
2016-07-16 00:09:18 +00:00
Roeland Jago Douma
db559e33be
Fix PHPUnit 5.4 warnings in files_sharing tests
2016-07-15 12:22:53 +02:00
Bjoern Schiessle
c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController
2016-07-14 16:39:48 +02:00
Bjoern Schiessle
56d3100f44
adjust copyright notices
2016-07-14 16:39:48 +02:00
Bjoern Schiessle
dc53788711
remove unused parameter
2016-07-14 16:39:48 +02:00
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
Lukas Reschke
813b58ab94
Merge pull request #398 from nextcloud/issue-388-fix-hidden-file-list-master
...
Fix hidden file list master
2016-07-14 15:37:42 +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
Joas Schilling
76736731eb
Allow shares with create permissions only aswell
2016-07-14 10:27:29 +02:00
Nextcloud bot
a6c23a1f8b
[tx-robot] updated from transifex
2016-07-14 00:09:19 +00:00
Nextcloud bot
afef11f84a
[tx-robot] updated from transifex
2016-07-13 00:09:46 +00: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 3731b2a006
.
Revert "[tx-robot] updated from transifex"
This reverts commit 94d91113f1
.
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
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
Lukas Reschke
01f8434a75
Merge pull request #57 from nextcloud/fdrop-template
...
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00