upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
31851 commits 1035 branches 1221 tags 8.3 GiB
Commit graph

2747 commits

Author SHA1 Message Date
Michael Jobst
8f5b9880cf
Fixed disappearing of share info in file view 2016-12-02 01:24:05 +01:00
Roeland Jago Douma
9bd2effca6
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 09:40:41 +01:00
Roeland Jago Douma
9666786655
[stable9] Fixes not allowed increasing of link share permissions 
Backport of #2100

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-14 15:46:03 +01:00
Jan-Christoph Borchardt
63edd5aa0e fix button on public upload page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-08 22:54:46 +01:00
Vincent Petry
c1c21da1f2
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 12:12:42 +02:00
Vincent Petry
c158acc6ea
Fix paths returned by \OC\Files\Storage\Shared hooks (#25519) 
Fixes #23620
 2016-08-29 15:08:45 +02:00
Roeland Jago Douma
adddd16cbb
Add files drop capability for clients 2016-08-15 21:43:30 +02:00
Joas Schilling
a5471b4a3e
Do not allow to delete/update group shares as a group member 2016-08-03 09:22:18 +02:00
Joas Schilling
ca6a7d9e6a
Run the license script 2016-07-22 09:48:05 +02:00
Joas Schilling
eb715dd1b6
Fix Sharing app tests with phpunit 5.2+ 2016-07-01 16:29:53 +02:00
Lukas Reschke
dcb5f00461
Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync 2016-06-26 12:48:19 +02:00
Roeland Douma
b6192c39d8
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-06-23 14:27:51 +02:00
Robin Appelman
fa9ba64552 Catch exceptions while creating shared mounts 2016-06-21 12:45:33 +02:00
Lukas Reschke
a11896766c
Some more branding 2016-06-20 22:10:20 +02:00
Morris Jobke
8abf6e0ed1
fixed code 2016-06-20 18:50:56 +02:00
Morris Jobke
555a3b597e
fixed translations 2016-06-20 18:50:46 +02:00
Vincent Petry
dc3db4e1c0
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-20 17:39:00 +02:00
Vincent Petry
f11e486025
Make getShareFolder use given view instead of static FS (#25150) 2016-06-20 17:39:00 +02:00
Vincent Petry
2f61c2963c
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-20 13:48:00 +02:00
Vincent Petry
0129437cd5 Make getShareFolder use given view instead of static FS (#25150) 2016-06-20 12:02:04 +02:00
Lukas Reschke
d3374220f5 Merge pull request #75 from nextcloud/brand-to-nextcloud 
Brand to nextcloud
 2016-06-14 11:42:48 +02:00
Arthur Schiwon
a761fd65f0
Merge branch 'stable9' of https://github.com/owncloud/core into downstream-160613 2016-06-13 23:45:21 +02:00
Lukas Reschke
7e5b0ad249
Do not link to ownCloud Federation page 2016-06-13 19:33:27 +02:00
Roeland Douma
d41d5c48f0 Show the path relative to the requesting user (#25067) 
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.

- Fixed tests
 2016-06-13 12:47:21 +02:00
Lukas Reschke
f3b299be78
Show spinner for files_drop again 
Somehow the spinner wasn't there anymore after some changes. This makes it appear again.
 2016-06-13 01:07:05 +02:00
Arthur Schiwon
7f5048e2e5
smaller files drop fixes 
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
 2016-06-13 00:15:09 +02:00
Lukas Reschke
68c38ae8c2
[stable9] Backport files drop feature 2016-06-11 11:38:16 +02:00
Lukas Reschke
218e4b48ad
Adjust some more branding texts 
Replaces ownCloud with Nextcloud in the user-facing messages
 2016-06-11 10:46:02 +02:00
Jan-Christoph Borchardt
8d32813c42 backport design change 2016-06-10 15:31:57 +02:00
Joas Schilling
afb4c1e694 Allow public upload when the quota is unlimited (#24988) 2016-06-06 13:48:38 +02:00
Vincent Petry
8f04bf3793
Backport of share id as string fix 2016-06-01 17:48:35 +02:00
Vincent Petry
0ec4098955 Merge pull request #24830 from owncloud/stable9-lenz1111-share_download_range_requests_support 
[stable9] lenz1111's fantastic share download range requests support
 2016-05-30 12:27:16 +02:00
Robin Appelman
35c32ca721 Improve isLocal performance for SharedStorage 2016-05-25 13:40:34 +02:00
Piotr Filiciak
f29f85709a
Http Range requests support in downloads 
Http range requests support is required for video preview
 2016-05-25 11:11:47 +02:00
Thomas Müller
877a8f09b4 Merge pull request #24574 from owncloud/stable9_24568 
[Stable 9] Fix etag propegation test race condition
 2016-05-11 16:29:08 +02:00
Roeland Jago Douma
8aebab9853
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:54:21 +02:00
Thomas Müller
750aeda8b7
Yo-ho-oh - Murder all band 'o pirates - backport of #24550 2016-05-11 11:22:08 +02:00
Robin Appelman
440cf335ad Add unit tests for shared size propagation with encryption 2016-04-21 14:24:49 +02:00
Vincent Petry
f981661195 Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:10:56 +02:00
Vincent Petry
1f4738c372 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 17:22:09 +01:00
Thomas Müller
3d0e4bdc82 Merge pull request #23493 from owncloud/stable9_22679 
[Stable 9] When the Share API is disabled do not return shares
 2016-03-23 08:07:06 +01:00
Roeland Jago Douma
7fb32f8358 When the Share API is disabled do not return shares 
Fixes #22668

Block everything in the OCS Share API
 2016-03-22 19:51:01 +01:00
Thomas Müller
656c7f38b6 Merge pull request #23478 from owncloud/backport-l10n 
Backport translations to stable9
 2016-03-22 17:44:59 +01:00
Joas Schilling
4fdb2254a4 Backport translations to stable9 2016-03-22 13:10:33 +01:00
Roeland Jago Douma
c7f1b82b4b Respect disabled group sharing in sharee endpoint 
* Fix tests
 2016-03-22 12:37:34 +01:00
Roeland Jago Douma
aa75cfcf14 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 12:37:20 +01:00
Thomas Müller
6afac05937 Merge pull request #23389 from owncloud/backport-23287-fed-share-action-links 
[9.0] Make sure to append the web root as per doc
 2016-03-21 11:16:15 +01:00
Joas Schilling
064e13511f Make sure to append the web root as per doc 2016-03-18 13:36:51 +01:00
Vincent Petry
fb705fa305 Add webdav property for share info in PROPFIND response 2016-03-18 11:36:39 +01:00
Thomas Müller
00ef623f1c Merge pull request #23259 from owncloud/backport-22998 
[stable9] Delay check till scanner is used
 2016-03-17 14:29:39 +01:00