wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28978 commits 157 branches 562 tags 714 MiB
Commit graph

2502 commits

Author SHA1 Message Date
Robin Appelman
3d5a7b307f Add test case for group share propagation 2015-12-10 13:53:50 +01:00
Thomas Müller
54dbe5b8d5 Merge pull request #20989 from owncloud/fix_20769 
Update parent when moving share into recieved share
 2015-12-09 13:07:57 +01:00
Thomas Müller
bc744ff6de Merge pull request #21038 from owncloud/share-computesharepermissions-notstore 
Fix (re)share permission checks in a few code paths
 2015-12-09 10:04:56 +01:00
Jenkins for ownCloud
dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Vincent Petry
6e4006d139 Add reshare permission checks 
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
 2015-12-08 13:13:26 +01:00
Joas Schilling
5453daab03 More fixes to the docs 2015-12-08 09:11:50 +01:00
Scrutinizer Auto-Fixer
0f1be1b601 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 20:08:20 +00:00
Scrutinizer Auto-Fixer
453e1bf66e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 15:43:36 +00:00
Roeland Jago Douma
d38949f423 Update parent when moving share into recieved share 
Fixes #20769

When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
 2015-12-07 16:28:33 +01:00
Scrutinizer Auto-Fixer
97f9213da9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 12:05:27 +00:00
Thomas Müller
00b592f2a6 Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale 
Fix hidpi previews on public page
 2015-12-07 10:23:58 +01:00
Thomas Müller
6b4f48e0f3 Merge pull request #20900 from owncloud/share-group-only-with-exact-match 
Only return the exact match, when it's allowed
 2015-12-03 09:21:29 +01:00
Thomas Müller
df5872ec50 Merge pull request #20719 from owncloud/adding-system-addressbook-of-users 
Adding system addressbook for users of this instance - a occ command …
 2015-12-02 16:17:58 +01:00
Joas Schilling
372f54075f Only return the exact match, when it's allowed 2015-12-02 16:01:01 +01:00
Thomas Müller
d4abbb10d3 Merge pull request #20884 from owncloud/fix_20713 
Respect disabled incoming federated shares
 2015-12-02 10:56:59 +01:00
Thomas Müller
df6fc6cc70 Add the user's cloud id to the vCard 2015-12-02 09:14:41 +01:00
Roeland Jago Douma
1e19661daa [Sharing] Respect disabled incoming federated shares 
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
 2015-12-02 09:00:21 +01:00
Jenkins for ownCloud
4f4b91a9ec [tx-robot] updated from transifex 2015-12-02 02:00:28 -05:00
Morris Jobke
00fcb95d86 Fix the width of the share with input 
* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes
 2015-11-30 16:46:51 +01:00
Thomas Müller
fd79511d68 Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav 
Fix public link getDownloadUrl to return Webdav public link
 2015-11-30 15:07:36 +01:00
Thomas Müller
757aa45db7 Adding more DB groups to test suits 
Adding more DB groups to test suits
 2015-11-30 10:55:06 +01:00
Thomas Müller
3bb6dcea64 Apply DB group annotation ... 2015-11-30 10:55:05 +01:00
Jenkins for ownCloud
39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Jenkins for ownCloud
dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Vincent Petry
42091cecf9 Fix public link getDownloadUrl to return Webdav public link 
This is for apps that use getDownloadUrl() to access the Webdav endpoint
for example for streaming.
Also happens when clicking on the download action of a file.

Note that the regular visible download URL is still the same.
 2015-11-25 17:39:49 +01:00
Thomas Müller
9ec2f8886e Merge pull request #20691 from owncloud/share2.0_di_fixes 
[Sharing 2.0] di fixes
 2015-11-25 15:25:50 +01:00
Thomas Müller
50f6817ce9 Merge pull request #20439 from owncloud/etag-propagate-in-storage 
Take submount etag into account for folder etags
 2015-11-25 12:49:54 +01:00
Thomas Müller
4bb346a1e6 Merge pull request #20692 from owncloud/federation_auto_add_servers 
auto-add ownClouds to the list of trusted servers
 2015-11-24 16:19:39 +01:00
Thomas Müller
6ce6e27560 Merge pull request #20595 from owncloud/fix-double-slashes 
Avoid double slashes in URL when trying to add an remote share
 2015-11-24 16:04:03 +01:00
Björn Schießle
964fa1fce3 use hooks to auto add server to the list of trusted servers once a federated share was created 2015-11-24 11:34:38 +01:00
Roeland Jago Douma
8d309767d7 [Sharing 2.0] Use the rootfolder to get the path of a share 
We need to use the rootfolder here since we also other people than the
shareOwner can request a share.
 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
85976b7293 [Sharing 2.0] Fix phpdoc etc 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
ab02b5c36e [Sharing 2.0] Move authentication to the OCS API 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
a2b8483779 [Sharing 2.0] Default share provider only generic DI 
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
aeae73b364 [Sharing 2.0] Removed unused DI stuff 
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
 2015-11-24 10:26:36 +01:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Thomas Müller
79bbda994b Merge pull request #16902 from owncloud/jsocclient 
Web UI uses Webdav instead of ajax/* calls
 2015-11-23 09:38:01 +01:00
Thomas Müller
57c9aa3ca7 Merge pull request #20558 from owncloud/remove-path-from-shared-with 
Unset `path` for shared with me
 2015-11-23 09:04:52 +01:00
Vincent Petry
ec3166742b Properly join path sections 
This prevents double slashes that can mess up path comparisons in some
cases.
 2015-11-22 16:05:51 +01:00
Thomas Müller
ab1d786d87 Fix port issue - options.host already has the port attached 2015-11-22 16:05:51 +01:00
Vincent Petry
21da6271a8 Parse share owner from Webdav to display in UI 2015-11-22 16:05:50 +01:00
Vincent Petry
f20232d4bd Make public link share page work with Webdav and add operations 
The public page now uses the public.php/webdav endpoint.

Also enabled more file operations like rename, move, delete and create
folder from the public page, which are now all possible thanks to the
public.php/webdav endpoint.
 2015-11-22 16:05:50 +01:00
Vincent Petry
fa2be0750c Make files app use Webdav for most operations 2015-11-22 16:05:50 +01:00
Robin Appelman
a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Robin Appelman
888df3933d take the etag of child mounts into account for the folder etag 
this replaces shared etag propagation
 2015-11-19 13:32:00 +01:00
blizzz
5d2e1268cd Avoid double slashes in URL when trying to add an remote share 
When being on a link share and clicking "Add to your ownCloud" a double slash might be inserted in the URL if the entered ownCloud host ended with a slash. Results in a server error.
 2015-11-18 22:48:35 +01:00
Lukas Reschke
048ad25416 Use proper variable 
`$shares` is not defined. Introduced with c3e7d324c5 and thus also in stable8.2
 2015-11-18 22:28:48 +01:00
Robin Appelman
1d82d93baa Implement getOwner for external share storage 2015-11-18 17:08:02 +01:00
Robin Appelman
ee87f12c09 Fix hidpi previews on public page 2015-11-18 16:45:19 +01:00
Lukas Reschke
cbd94ce355 Unset path for shared with me 
The original path is not required for a share recipient.
 2015-11-17 14:09:29 +01:00