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

12804 commits

Author SHA1 Message Date
Thomas Müller
5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs 
Add autodiscovery support to server-to-server sharing implementation
 2016-03-01 11:27:28 +01:00
Thomas Müller
73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote 
use ocs discover endpoint to test remote
 2016-03-01 11:27:07 +01:00
Thomas Müller
1652541150 Merge pull request #22700 from owncloud/only_1_linkshare 
For now only allow 1 link share per file/folder
 2016-03-01 09:22:39 +01:00
Thomas Müller
25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening 
Hides nodes from listing that the user has no access to
 2016-03-01 09:22:08 +01:00
Thomas Müller
fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset 
Don't return quota when none set
 2016-03-01 08:30:58 +01:00
Roeland Jago Douma
ffce4fc6a9 For now only allow 1 link share per file/folder 
Fixes #22692
This is a temp fix util we get #22327

We just block it in the OCS Share API since we have 1 endpoint now
anyway.
 2016-03-01 08:25:40 +01:00
Thomas Müller
eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key 
make decrypt all work with the master key
 2016-03-01 08:23:27 +01:00
Thomas Müller
f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates 
Check correct permissions when resharing
 2016-03-01 08:17:56 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api 
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
 2016-03-01 07:24:57 +01:00
Lukas Reschke
9ca1e9c7e9 Only use scanner if remote is an ownCloud 2016-03-01 07:01:52 +01:00
Lukas Reschke
e965dcaebf /shareinfo is not required 2016-03-01 07:01:52 +01:00
Lukas Reschke
8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Lukas Reschke
74e47da883 Add missing trailing slash 2016-03-01 07:01:51 +01:00
Robin Appelman
080a62231e use ocs discover endpoint to test remote 2016-03-01 07:01:51 +01:00
Lukas Reschke
88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Lukas Reschke
d04edfaf0d Hides nodes from listing that the user has no access to 2016-02-29 20:53:38 +01:00
Roeland Jago Douma
8924b0a0dc Check correct permissions when resharing 
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
 2016-02-29 19:30:14 +01:00
Thomas Müller
52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external 
Print docker logs to the console fro debugging
 2016-02-29 16:36:34 +01:00
Bjoern Schiessle
95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry
11215f4e27 Return -3 for unlimited quota 
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
 2016-02-29 14:36:20 +01:00
Thomas Müller
a38e8b6436 Merge pull request #22662 from owncloud/comments-count 
remove comments count because it is not that relevant to show directly
 2016-02-29 13:44:56 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670 
Move the tag filter at the end for now
 2016-02-26 10:48:55 +01:00
Thomas Müller
66536f912e Merge pull request #22640 from owncloud/fix_22587 
Remove delete permissions for read-only federated reshares
 2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags 
Rename system tags app to collaborative tags
 2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773 
Allow theming of actions
 2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Lukas Reschke
59028cced0 Add autodiscovery support to server-to-server sharing 
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
 2016-02-26 09:26:55 +01:00
Joas Schilling
4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry
867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7 Make more action icons themable + style fixes 
Action icons now appear properly in public link page.
More actions are now CSS icons.
 2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt
6e97ab1b71 remove comments count because it is not that relevant to show directly 2016-02-25 20:48:19 +01:00
Thomas Müller
3772a8acdb Merge pull request #22644 from owncloud/external-share-manager 
inject the correct external share manager into the storage
 2016-02-25 16:58:00 +01:00
Thomas Müller
29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob 
Skip users with no trashbin
 2016-02-25 16:55:36 +01:00
Robin Appelman
f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller
914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages 
Fix HTTPS support on external storages
 2016-02-25 14:36:00 +01:00
Thomas Müller
202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption 
Copy into local file
 2016-02-25 14:35:39 +01:00
Thomas Müller
5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault 
Disable sharing by default for external storage mounts
 2016-02-25 14:35:24 +01:00
Thomas Müller
dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname 
take the first result of that array, if present. Fixes 2nd display na…
 2016-02-25 14:35:06 +01:00
Roeland Jago Douma
0c9c7737b4 Remove delete permissions for read-only federated reshares 
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.

However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.

This PR removes the delete permissions if it is a shared storage.

Basically a quick hack.
Fixes #22587
 2016-02-25 12:19:38 +01:00
Lukas Reschke
aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Lukas Reschke
3b5ddb417c Copy into local file 
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
 2016-02-25 09:40:30 +01:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00