b130267e58
Import the used classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-24 14:33:54 +02:00
b4ebf03bef
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 13:25:59 +02:00
f589f1a1d6
Move files_sharing Controllers => Controller
...
lib/Controller is the default location for controllers. So lets put them
all in there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 11:46:25 +02:00
6604e76e94
Fix middleware tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
ea07bbc562
Move Share20OCS to ShareAPIController
...
It was already a controller just still residing in its old location.
* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
7792902808
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-21 21:43:15 +02:00
e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/
...
In case no preview is available we display the ownCloud logo
Fix unit test
2016-10-21 21:42:40 +02:00
2799b0a821
Merge pull request #1835 from nextcloud/downstream-24948
...
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 23:48:15 +02:00
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 20:27:44 +02:00
d4976e5554
Fix post_unshareFromSelf hook parameter format
...
When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.
This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
2016-10-20 16:09:08 +02:00
5e48ce98c7
Merge pull request #1784 from nextcloud/fix-activity-filter-names
...
Adjust wording to make the separation between sharing and files more clear
2016-10-19 09:45:30 +02:00
0c8bd9fa49
Merge pull request #1788 from nextcloud/share-link-whitespace
...
add whitespace above share link so it's visually distinguished more
2016-10-18 20:19:58 +02:00
9f2e370ed7
add whitespace above share link so it's visually distinguished more
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-18 19:43:18 +02:00
b112493d1a
Adjust wording to make the separation between sharing and files clearer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-18 17:18:14 +02:00
2bb031ecc6
Merge pull request #1606 from nextcloud/search-detail
...
search design details
2016-10-18 13:48:01 +02:00
943d9737e4
[tx-robot] updated from transifex
2016-10-18 00:06:51 +00:00
00ed841559
[tx-robot] updated from transifex
2016-10-15 00:06:56 +00:00
2de59d8a2a
remove unneeded unlock
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
ab10a54836
remove duplicate trait
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:38 +02:00
f63f0aa1ae
get node by path as fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
9754724c8b
fix getting recipient share in ocs api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
7d1e800c15
fix share tests not passing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
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
3845d4ec9a
more robust test setup
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
7ce68ce6ac
phpunit is weird
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
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
3f40bb69f8
[tx-robot] updated from transifex
2016-10-10 00:06:58 +00:00
9fc3209d2c
[tx-robot] updated from transifex
2016-10-09 00:06:49 +00:00
0beecbf2c5
[tx-robot] updated from transifex
2016-10-08 00:06:50 +00:00
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
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
671f16f706
Add icons to activity navigation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
96af627bb7
fix sharing icon's alignment and add padding to the unshare icon
2016-10-03 09:35:54 +02:00
07a1be2e06
[tx-robot] updated from transifex
2016-10-03 00:12:47 +00:00
6297d201df
[tx-robot] updated from transifex
2016-10-02 00:16:25 +00:00
da03018add
[tx-robot] updated from transifex
2016-10-01 00:08:23 +00:00
99076a8c0d
[tx-robot] updated from transifex
2016-09-30 00:08:13 +00:00
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
0f321fe116
Merge pull request #1534 from nextcloud/svg-optimization
...
Svgo optimization
2016-09-28 23:05:48 +02:00
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
71830b285c
Svgo optimization
...
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
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
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
a086011e00
[tx-robot] updated from transifex
2016-09-25 00:09:40 +00:00
b30c79b63c
[tx-robot] updated from transifex
2016-09-23 00:09:45 +00:00
6a873acf46
[tx-robot] updated from transifex
2016-09-22 00:11:32 +00:00
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
f4a4578f0d
[tx-robot] updated from transifex
2016-09-19 00:09:33 +00:00
cb6e16ab5c
[tx-robot] updated from transifex
2016-09-17 00:10:14 +00:00
9fa288f12b
[tx-robot] updated from transifex
2016-09-16 00:09:34 +00:00
4fdee00c27
[tx-robot] updated from transifex
2016-09-15 00:12:37 +00:00
56d37e27bc
Fix tests
2016-09-13 09:40:59 +02:00
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
a45cfbc2d2
search design details
2016-09-09 18:01:00 +02:00
ba104233b0
Move remote_shares OCS endpoint to AppFramework
2016-09-09 07:40:33 +02:00
f5aafdc897
[tx-robot] updated from transifex
2016-09-09 00:09:31 +00:00
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
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
268c5a0aa0
Adjust test
2016-09-08 20:34:04 +02:00
9a2ae2fe7d
Fix tests
2016-09-08 20:11:21 +02:00
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
9adf78c155
dont show shares you own in "shared with you"
2016-09-07 18:38:08 +02:00
e8e950a4d2
more efficient querying of numeric storage ids
2016-09-07 17:22:40 +02:00
7c0951244a
Deprecate getEditionString()
2016-09-06 16:05:28 +02:00
c629761fea
Fix getMock files_sharing
2016-09-06 09:29:27 +02:00
8b484eedf0
[tx-robot] updated from transifex
2016-09-05 00:09:10 +00:00
fc02c4a980
[tx-robot] updated from transifex
2016-09-04 00:09:21 +00:00
e7f618ef14
[tx-robot] updated from transifex
2016-09-03 00:09:24 +00:00
4a5cd74fb2
[tx-robot] updated from transifex
2016-09-01 00:09:24 +00:00
a0af513a4a
Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
...
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
423378ea17
Added closeCursor in SharedMount numeric id
2016-08-30 19:49:31 +02:00
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:49:23 +02:00
ec9fd67bc5
Allow space for federated share id search
2016-08-30 11:11:59 +02:00
6c365cb06d
A shared storage is never a home storage - fixes #25582
2016-08-29 14:13:26 +02:00
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
cae87d028d
Fix tests
2016-08-24 21:30:42 +02:00
a1ed8207e9
HTTPHelper is deprecated
...
Use the IClientService instead
2016-08-24 21:30:39 +02:00
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
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
1e7c108bff
handle failed shares
2016-08-22 12:32:39 +02:00
3ed01e8459
Lazy init shared storage
2016-08-22 12:27:56 +02:00
95570d607c
reuse existing root id
2016-08-22 12:27:20 +02:00
fda4241dfb
Cleanup Tests
2016-08-17 20:45:29 +02:00
af074eb2b7
Move updateShare and getShares over to use proper parameters
...
* Update tests
2016-08-17 20:45:29 +02:00
22e23f3045
Use parameters in createShare
...
* Fix tests
2016-08-17 20:45:27 +02:00
ec4d127e58
Merge pull request #905 from nextcloud/invisible_icons
...
Fix icons on App page in FF
2016-08-17 17:24:16 +02:00
39c180117e
[tx-robot] updated from transifex
2016-08-17 13:30:52 +00:00
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
0cc8b8b244
[tx-robot] updated from transifex
2016-08-17 00:09:19 +00:00
8c424c7971
[tx-robot] updated from transifex
2016-08-16 00:10:47 +00:00
396678c9ce
Merge pull request #855 from nextcloud/files_drop_capability
...
Add files drop capability for clients
2016-08-15 15:38:35 +02:00
f3124b5052
[tx-robot] updated from transifex
2016-08-15 00:12:16 +00:00
9daf41e05a
Add files drop capability for clients
2016-08-13 14:02:09 +02:00
4da01eeef6
[tx-robot] updated from transifex
2016-08-13 00:13:29 +00:00
35358bdde0
[tx-robot] updated from transifex
2016-08-12 00:10:18 +00:00
f68f1d5f37
[tx-robot] updated from transifex
2016-08-11 12:08:42 +00:00
56bf0a8399
[tx-robot] updated from transifex
2016-08-11 00:14:12 +00:00
ba922c9f73
Merge pull request #807 from nextcloud/ocs_dataresponse
...
OCSController requires DataResponse
2016-08-10 22:36:25 +02:00
67d016833d
Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
...
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
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
4006763f5b
Move the Share20OCS code over to use the proper DataResponse
2016-08-10 12:40:32 +02:00
412b5c5407
Store the shared propagator instance
...
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
d6bee61131
[tx-robot] updated from transifex
2016-08-10 00:09:59 +00:00
a999420c75
get shared storage storage id without setting up the storage
2016-08-09 15:52:13 +02:00
3a26def7cf
[tx-robot] updated from transifex
2016-08-09 00:10:11 +00:00
352e8b3c79
More casing
2016-08-08 16:45:40 +02:00
dae6432ae7
Increment the versions and adjust the capitilization
2016-08-08 16:45:40 +02:00
70eef2a82e
Merge pull request #445 from nextcloud/ocs_share_to_appframework
...
OCS Share API to appframework
2016-08-08 14:59:59 +02:00
b80e3e70e5
[tx-robot] updated from transifex
2016-08-06 00:10:17 +00:00
0556e40d3e
Fix tests
2016-08-05 14:17:32 +02:00
d9418c105e
Add OCSShareAPIMiddleware tests
2016-08-05 14:17:32 +02:00
4504d7f5e9
DataResponse required ['data' => DATA]
2016-08-05 14:17:31 +02:00
7fdc2f32fa
More exceptions
2016-08-05 14:17:31 +02:00
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
8b160077f1
Throw OCSNotFoundExceptions
2016-08-05 14:17:25 +02:00
54f21bccdf
Remove unneeded wrapper
2016-08-05 14:17:25 +02:00
a32caa4904
Convert Share API to use the AppFramework
2016-08-05 14:17:25 +02:00
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
c44c9a55f4
[tx-robot] updated from transifex
2016-08-05 00:10:09 +00:00
258ee140a4
[tx-robot] updated from transifex
2016-08-04 00:11:51 +00:00
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
0bddaa23b0
Added more tests for sharing's MountProvider
2016-08-03 10:16:28 +02:00
714d7ec936
Improved share grouping readability + fixed test
2016-08-03 10:16:28 +02:00
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
0874460e48
[tx-robot] updated from transifex
2016-08-03 00:11:12 +00:00
4e5fb74773
Do not allow to delete/update group shares as a group member
2016-08-02 10:50:35 +02:00
50c8367041
[tx-robot] updated from transifex
2016-08-01 00:10:15 +00:00
2565a39361
[tx-robot] updated from transifex
2016-07-30 00:11:16 +00:00
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
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
937577f7bc
[tx-robot] updated from transifex
2016-07-29 00:09:49 +00:00
a20f4c432b
[tx-robot] updated from transifex
2016-07-24 00:09:10 +00:00
e36decc12b
[tx-robot] updated from transifex
2016-07-23 00:09:06 +00:00
7400ff05ac
Also increase the min version
2016-07-22 14:46:52 +02:00
6062b6365b
bumb compatible app versions for core apps
2016-07-22 13:04:23 +02:00
03cb588ea9
Merge pull request #500 from nextcloud/bump_version
...
Bump version
2016-07-22 10:03:42 +02:00
4b4990c48f
[tx-robot] updated from transifex
2016-07-22 00:10:05 +00:00
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
86129a8b88
Increase app versions
2016-07-21 15:50:30 +02:00
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
b7c5a59adf
[tx-robot] updated from transifex
2016-07-21 00:09:07 +00:00
1ab1e000e8
move closing div to the right place
2016-07-20 18:34:32 +02:00
4d67429cf0
Use an icon to set the email instead of a button with string
2016-07-20 15:07:46 +02:00
daaa3ded8d
Add clipboard button to public share link
2016-07-20 15:07:41 +02:00
4a963c21ff
[tx-robot] updated from transifex
2016-07-19 00:09:00 +00:00
f7d26e4aa5
Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
...
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
b23d3c6418
[tx-robot] updated from transifex
2016-07-18 14:08:51 +00:00
773250be24
Cleanup coding style
2016-07-18 13:35:35 +02:00
1c5e082ee1
Add eventdispatcher to public link view
2016-07-18 13:35:35 +02:00
ea3035aa0e
Move JS inclusion to Controller
...
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
ff54141639
Move SetupFromToken to ShareManager
2016-07-18 10:53:49 +02:00
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
d6907fe84d
[tx-robot] updated from transifex
2016-07-16 00:09:18 +00:00
db559e33be
Fix PHPUnit 5.4 warnings in files_sharing tests
2016-07-15 12:22:53 +02:00
c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController
2016-07-14 16:39:48 +02:00
56d3100f44
adjust copyright notices
2016-07-14 16:39:48 +02:00
dc53788711
remove unused parameter
2016-07-14 16:39:48 +02:00
5bbba490c4
move some stuff over to the federatedfilesharing app
2016-07-14 16:39:48 +02:00
2f23054b01
s/ownCloud/Nextcloud
2016-07-14 16:39:48 +02:00
33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id
2016-07-14 16:39:48 +02:00
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
1394b0afb9
replace 'ownCloud' with 'Nextcloud'
2016-07-14 11:22:35 +02:00
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
76736731eb
Allow shares with create permissions only aswell
2016-07-14 10:27:29 +02:00
a6c23a1f8b
[tx-robot] updated from transifex
2016-07-14 00:09:19 +00:00
afef11f84a
[tx-robot] updated from transifex
2016-07-13 00:09:46 +00:00
e29835a702
[tx-robot] updated from transifex
2016-07-12 00:09:34 +00:00
d15fd5cb96
Change occurence of ownCloud ( #352 )
2016-07-11 13:49:19 +02:00
67278d12e1
[tx-robot] updated from transifex
2016-07-11 00:09:22 +00:00
4aae157087
[tx-robot] updated from transifex
2016-07-10 00:09:23 +00:00
c108d816ac
[tx-robot] updated from transifex
2016-07-09 00:09:16 +00:00
d0e6fdba4d
combine if statements
2016-07-08 12:36:15 +02:00
039f730700
handle errors while getting fileinfo
2016-07-08 12:36:07 +02:00
f98cb9efa0
Fix type hinting
2016-07-08 12:35:50 +02:00
951ff0897c
hint global handlebars
2016-07-08 12:35:33 +02:00
f0b9eba9c2
dont overwrite a variable with a different type
2016-07-08 12:35:23 +02:00
a84250e0af
[tx-robot] updated from transifex
2016-07-08 00:09:25 +00:00
2a1a3957b6
Merge pull request #333 from nextcloud/sync-master
...
Sync master
2016-07-07 19:29:43 +02:00
beae00a5e5
Simplify test code and don't show anything if no date is set
2016-07-07 15:10:04 +02:00
43b26b9506
add unit tests
2016-07-07 15:10:04 +02:00
059cc1f22e
Update header during update callback
2016-07-07 15:10:03 +02:00
c809db86f5
Not set expiration date is represented as 0
2016-07-07 15:10:03 +02:00
ab3c8d4de9
add "Never" if expiration date is not set
2016-07-07 15:10:03 +02:00
b5dea82e45
Add expiration date to share by link view
2016-07-07 15:10:03 +02:00
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
4a0efa38c0
[tx-robot] updated from transifex
2016-07-07 08:58:00 +00: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
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
63132483ca
[tx-robot] updated from transifex
2016-06-03 02:19:30 -04:00
5c8e0596e6
Allow public upload when the quota is unlimited
2016-06-02 15:27:16 +02:00
f9f8fb7bf2
[tx-robot] updated from transifex
2016-06-02 01:55:16 -04:00
b2e524b936
[tx-robot] updated from transifex
2016-05-31 01:54:58 -04:00
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
985063a7e2
[tx-robot] updated from transifex
2016-05-30 01:57:01 -04:00
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
567381e361
[tx-robot] updated from transifex
2016-05-26 01:56:23 -04:00
3f0b2d148d
Move tests to PSR-4
2016-05-25 15:00:00 +02:00
b72706b450
Move background job to PSR-4
2016-05-25 14:59:59 +02:00
3a716ae91c
Move lib/ to PSR-4
2016-05-25 14:59:59 +02:00
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
25f3110730
Fix ShareControllerTest ( #24824 )
2016-05-25 10:21:07 +02:00
6972f4dc50
[tx-robot] updated from transifex
2016-05-25 02:03:38 -04:00
f1f7511c61
[tx-robot] updated from transifex
2016-05-24 15:24:38 -04:00
465cf9fe9b
Merge pull request #24346 from lenz1111/fix_24331
...
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
df59c5d1ee
bug fix
2016-05-24 12:43:43 +02:00
11b2e98a30
video poster
2016-05-24 12:34:37 +02:00
adcf942901
Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
...
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
5ba1add03c
Merge pull request #24603 from owncloud/federated_reshare
...
flat federated re-share
2016-05-23 09:52:13 +02:00
357d342467
[tx-robot] updated from transifex
2016-05-23 01:55:10 -04:00
88328000b1
[tx-robot] updated from transifex
2016-05-22 01:56:56 -04:00
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self
2016-05-20 21:15:16 +02:00
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app
2016-05-20 21:15:16 +02:00
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
81e3787f9c
close cursor after select to avoid db lock
2016-05-20 21:15:11 +02:00
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
5a1641bed2
move request handler for federated shares to the federated sharing app
2016-05-20 21:15:08 +02:00
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
320b1c3abf
Fix more failures
2016-05-19 10:11:42 +02:00
7ca5b35379
[tx-robot] updated from transifex
2016-05-19 01:54:58 -04:00
5c9103287f
Group fixup ( #24621 )
...
* Move used OC_Group_xx to \OC\Group
* Add (deprecated) legacy wrapper in legacy, OC_Group_xx
* Replace deprecated use of OC_Group_xx with \OC\Group\xx
2016-05-17 16:06:44 +02:00
c24a685ab5
[tx-robot] updated from transifex
2016-05-17 01:54:56 -04:00
bafa02d312
[tx-robot] updated from transifex
2016-05-16 01:54:58 -04:00
53437ecced
Fix: Bugs in shared link with video #24331
2016-05-15 15:41:02 +02:00
7c28f62e20
[tx-robot] updated from transifex
2016-05-15 01:55:34 -04:00
83cd655675
[tx-robot] updated from transifex
2016-05-14 01:56:45 -04:00
cba4875e4d
[tx-robot] updated from transifex
2016-05-13 02:08:45 -04:00
eea98f1d74
Background jobs from info.xml ( #24582 )
...
* Move background job registration of Federation to info.xml
* Move background registration of Files app to info.xml
* Move background job registration of files_sharing to info.xml
* Move background job registration of files_trashbin to info.xml
* Move background job registration of files_versions to info.xml
* Move background job registration from user_ldap to info.xml
2016-05-12 10:43:43 +02:00
c5ae14453a
[tx-robot] updated from transifex
2016-05-12 02:08:58 -04:00
8bfa532075
Fix test race condition
...
E-tag propagation replies on the mtime of the file. Order of events:
1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.
Now this goes right often when 1 and 2 happen in the same second.
However imagine
1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)
Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:07:37 +02:00
199b447527
Yo-ho-oh - Murder all band 'o pirates
2016-05-11 09:16:17 +02:00
10e0fc0629
[tx-robot] updated from transifex
2016-05-09 02:08:23 -04:00
5d35844aff
[tx-robot] updated from transifex
2016-05-08 01:54:53 -04:00
956c3f2719
[tx-robot] updated from transifex
2016-05-07 01:54:56 -04:00
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
48be0b781a
[tx-robot] updated from transifex
2016-05-05 01:55:08 -04:00
cd7f4ed96f
[tx-robot] updated from transifex
2016-05-04 02:11:59 -04:00
547830d97e
Merge pull request #22989 from owncloud/lock_sharing_ops
...
Add locking to modifying operation of the OCS Share API
2016-05-03 10:15:54 +02:00
354329acf2
Cleanup Files_Sharing CLASSPATH
...
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
5a62c74495
Merge pull request #24376 from owncloud/remove_dead_code
...
Remove dead code
2016-05-02 09:57:28 +02:00
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
a323111bd1
[tx-robot] updated from transifex
2016-05-02 02:08:49 -04:00
ff8980d59c
[tx-robot] updated from transifex
2016-05-01 01:55:00 -04:00
8a652d1238
Unlock before all returns
2016-04-30 11:34:06 +02:00
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
62bc53143e
Add locking to modifying operation of the OCS Share API
...
Fixes #17243
This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.
* Updated unit tests to work with logging
2016-04-30 10:32:35 +02:00
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
1f63e8df61
[tx-robot] updated from transifex
2016-04-29 01:54:56 -04:00
ba0099f73a
[tx-robot] updated from transifex
2016-04-28 01:55:14 -04:00
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
14c3491977
[tx-robot] updated from transifex
2016-04-26 04:50:32 -04:00
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
a3813c55da
Merge pull request #24124 from owncloud/encryped-size-progation
...
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
1ab27ddd4a
Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
...
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00
cd01c440a0
Merge pull request #23919 from owncloud/cyclyc-share-dep-example
...
SharedStorage to new sharing code + cleanup
2016-04-20 20:37:27 +02:00
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
34b753baa0
Merge pull request #23952 from owncloud/hide-hidden-files
...
Add option to hide hidden files
2016-04-20 11:58:38 +02:00
6c5696d3a8
filter hidden files on the web interface
...
add checkbox to toggle show/hide hidden files
persist show hidden setting
fix settings menu layout
test ApiController::showHiddenFiles
don't show hidden files by default
Store config in Backbone model and inject it into FileList
Filter files only temporarily when rending the file list
Fix file rename validation
2016-04-19 16:08:56 +02:00
dd7e0d13e5
Move the group dummy backend to test
...
The dummy backend is only used for testing and should thus reside in
tests.
2016-04-19 15:13:31 +02:00
05d203a989
replace $.parseJSON() by JSON.parse()
2016-04-19 15:06:42 +02:00
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
6123badbfa
Move SharedStorage et al over to the shareManager and jail
2016-04-19 14:04:00 +02:00
d1d80b4f9e
set correct permissions in shareinfo
2016-04-18 12:02:06 +02:00
411fac892a
On mount make sure multiple shares with same target map to unique ones ( #23937 )
...
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in
Before: show only the 'foo' from user1
After: show both.
* Added intergration tests
2016-04-14 11:50:27 +02:00
a2da7614a0
[tx-robot] updated from transifex
2016-04-13 01:54:59 -04:00
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
be9b685926
Merge pull request #23444 from owncloud/add-loading-spinner
...
Add loading spinner to "Add to owncloud"
2016-04-07 13:52:34 +02:00
73d5889c5d
add loading spinner to add to owncloud input field
...
Update public.js
Update public.js
2016-04-07 04:33:46 -04:00
1576a9a10b
[tx-robot] updated from transifex
2016-04-07 01:56:01 -04:00
db5ea95e29
Add capability to show if group sharing is enabled
...
fixes #23477
Now clients can correct wording to properly reflect who a user can share
with.
2016-04-04 19:35:01 +02:00
cce6194368
[tx-robot] updated from transifex
2016-04-01 01:56:19 -04:00
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
a9aa39efbf
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:09:02 +02:00
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
1079554284
[tx-robot] updated from transifex
2016-03-27 01:55:45 -04:00
9ee1f506f2
Return remote shares in oc:share-types Webdav property
...
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
2016-03-24 12:16:57 +01:00
61c5717281
Merge pull request #23463 from owncloud/lets-consistently-use-no-referer
...
Consistently use rel=noreferrer
2016-03-23 09:14:54 +01:00
d5be21fe81
Merge pull request #23398 from owncloud/block_group_sharing
...
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
00f48ec37b
When the Share API is disabled do not return shares
...
Fixes #22668
Block everything in the OCS Share API
2016-03-22 19:43:23 +01:00
e69a09756b
Respect disabled group sharing in sharee endpoint
...
* Fix tests
2016-03-22 17:13:34 +01:00
52826d0e24
Block group sharing in API and in share manager
...
* Fix tests
2016-03-22 17:13:34 +01:00
8852fdaee3
Merge pull request #22789 from owncloud/dav-sharesproperty
...
Add webdav property for share info in PROPFIND response
2016-03-21 11:15:00 +01:00
35bc315f59
[tx-robot] updated from transifex
2016-03-21 01:55:40 -04:00
6ad957906e
Consistently use rel=noreferrer
...
When linking to external entities we should consistently use rel=noreferrer
2016-03-20 15:27:20 +01:00
1f1d87d413
[tx-robot] updated from transifex
2016-03-20 01:55:09 -04:00
f778e48ee5
Add webdav property for share info in PROPFIND response
2016-03-17 15:35:21 +01:00
8fb3e44610
Merge pull request #23287 from owncloud/issue-22786-absolute-paths
...
Fix absolute path creation for remote shares with /oc webroot
2016-03-17 14:29:57 +01:00
225eebd8f9
Merge pull request #23155 from owncloud/fed-unshare-with
...
Specify the target user when unsharing a federated share
2016-03-16 11:19:09 +01:00
140d5f7df3
Make sure to append the web root as per doc
2016-03-16 09:37:48 +01:00
Joas Schilling
Roeland Jago Douma
Thomas Müller
Morris Jobke
Joas Schilling
Vincent Petry
Jan-Christoph Borchardt
Nextcloud bot
Robin Appelman
Lukas Reschke
Christoph Wurst
skjnldsv
Roeland Jago Douma
Björn Schießle
Björn Schießle
Robin Appelman
Jenkins for ownCloud
Thomas Müller
Lukas Reschke
Arthur Schiwon
Torben Dannhauer
Joas Schilling
Piotr Filiciak
Roeland Jago Douma
Christoph Wurst
Stefan Weil
Erik Pellikka