upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-21 01:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
34286 commits 956 branches 1208 tags 8.5 GiB
Commit graph

758 commits

Author SHA1 Message Date
Roeland Jago Douma
fa6f216cd8 Merge pull request #2826 from nextcloud/stable10-2659 
[stable10] Fix overwriting parameter
 2016-12-22 15:08:58 +01:00
Roeland Jago Douma
f55b0e64f0
Fix overwriting parameter 
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-22 14:05:26 +01:00
Robin Appelman
24396e4fa3
use unmasked permissions in shared scanner 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-15 16:01:30 +01:00
Robin Appelman
2dd97bb52d
apply permissions mask for shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 18:02:34 +01:00
Roeland Jago Douma
8315891418
[Stable10] Fixes not allowed increasing of link share permissions 
Backport of #2100

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 09:17:02 +01:00
Vincent Petry
335fcb1a43
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".

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:17:57 +02:00
Vincent Petry
4c177ce6af
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 11:39:22 +02:00
Vincent Petry
6d1ccefc90
Added closeCursor in SharedMount numeric id 2016-08-30 19:47:16 +02:00
Vincent Petry
c4f303d19c
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:45:22 +02:00
Vincent Petry
102d4dc1af
Allow space for federated share id search 2016-08-30 12:57:23 +02:00
Thomas Müller
bc3c4ebd2d
[stable9.1] Added integration test (#25675) 
* [stable9.1] Added integration test

* A shared storage is never a home storage - fixes #25582
 2016-08-30 08:32:12 +02:00
Roeland Jago Douma
4528bdabe7
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:17:28 +02:00
Robin Appelman
fa980af53c prevent infinite recursion while getting storage from mount 2016-08-23 13:59:01 +02:00
Robin Appelman
58b810a547 handle failed shares 2016-08-22 12:41:16 +02:00
Robin Appelman
f4e89c15bf Lazy init shared storage 2016-08-22 12:41:12 +02:00
Robin Appelman
89d4684ef1 reuse existing root id 2016-08-22 12:41:08 +02:00
Roeland Jago Douma
f1d4341dd7
Add files drop capability for clients 2016-08-15 21:29:03 +02:00
Lukas Reschke
550c5ee7c4 Merge pull request #811 from nextcloud/shared-cachethepropagatorinstance-stable10 
Store the shared propagator instance
 2016-08-10 17:24:44 +02:00
Robin Appelman
5321a8728e get shared storage storage id without setting up the storage 2016-08-10 13:05:32 +02:00
Vincent Petry
5edd5100fe
Store the shared propagator instance 
This instead of recreating it for every call.
 2016-08-10 10:59:56 +02:00
Vincent Petry
e75a0a44c6
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-04 19:50:16 +02:00
Vincent Petry
3e8b787dd1
Improved share grouping readability + fixed test 2016-08-04 19:50:16 +02:00
Roeland Jago Douma
39ebf120c2
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-04 19:49:27 +02:00
Joas Schilling
7289cb5ec0
Do not allow to delete/update group shares as a group member 2016-08-03 09:17:50 +02:00
Joas Schilling
23b205ed48
Run the license script 2016-07-22 11:40:41 +02: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
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
Bjoern Schiessle
dc53788711
remove unused parameter 2016-07-14 16:39:48 +02:00
Joas Schilling
76736731eb
Allow shares with create permissions only aswell 2016-07-14 10:27:29 +02:00
Robin Appelman
d0e6fdba4d
combine if statements 2016-07-08 12:36:15 +02:00
Robin Appelman
f98cb9efa0
Fix type hinting 2016-07-08 12:35:50 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type 2016-07-08 12:35:23 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02: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
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
a636078e6c
Make getShareFolder use given view instead of static FS 2016-06-17 11:11:59 +02:00
Robin Appelman
4f02bd1dff disable cleanFolder for the federated share storage 2016-06-14 17:29:09 +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