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

2728 commits

Author SHA1 Message Date
Thomas Müller
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
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller
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
Thomas Müller
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
Joas Schilling
140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Thomas Müller
d4a8d5d2ea Merge pull request #22998 from owncloud/delay-loading-the-scanner 
Delay check till scanner is used
 2016-03-15 12:16:02 +01:00
Thomas Müller
0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage 
dont break when there is an invalid share
 2016-03-15 12:15:05 +01:00
Jenkins for ownCloud
2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Robin Appelman
7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller
101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search 
Return the correct group casing in sharee api
 2016-03-13 19:51:07 +01:00
Roeland Jago Douma
6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma
4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Joas Schilling
aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling
8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Robin Appelman
a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman
3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller
b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes 
Fix some scrutinizer warning in the sharing code
 2016-03-10 22:17:06 +01:00
Roeland Jago Douma
e6712c47a6 Fix some scrutinizer warning in the sharing code 
* Better phpdoc
* Promper use statements
* Unused parameter
 2016-03-10 21:35:22 +01:00
Roeland Jago Douma
517ef52560 Add mimetype to OCS Share API output 
Fixes #23044
 2016-03-10 15:41:17 +01:00
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Lukas Reschke
80b91264e1 Delay check till scanner is used 
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
 2016-03-09 16:01:53 +01:00
Thomas Müller
290a16e5d7 Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero 
Public link share disabled if password length is equal to 0
 2016-03-09 12:22:01 +01:00
Thomas Müller
30cec687ae Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents 
Use HTTPClient instead of file_get_contents
 2016-03-09 12:20:06 +01:00
Thomas Müller
3608421800 Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun 
Use "hasKey" instead of checking the value
 2016-03-09 12:19:45 +01:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Lukas Reschke
c0200bc5c3 Use "hasKey" instead of checking the value 
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
 2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae Use HTTPClient instead of file_get_contents 
Allows us to catch exceptions like 404's and thus prevents stuff like:

```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
 2016-03-08 22:13:00 +01:00
Vincent Petry
e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller
2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api 
Cleanup OCS Share Api
 2016-03-08 09:41:20 +01:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
prastut
7e52aac771 Public link share disabled if password length is equal to 0 2016-03-08 04:25:35 +05:30
Roeland Jago Douma
b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142 Move common code to function 
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
 2016-03-07 16:14:57 +01:00
Vincent Petry
dbea268332 Remove "files" arg from download URL in public link page 
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
 2016-03-07 11:55:55 +01:00
Vincent Petry
d8e592d670 Fix archive file name when downloading public share 
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
 2016-03-07 11:37:49 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
f2088cafb8 Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud 
Cache results of testRemoteUrl
 2016-03-06 20:00:47 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Lukas Reschke
63bd6b25db Cache results of testRemoteUrl 
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.

Replaces https://github.com/owncloud/core/pull/22855
 2016-03-04 15:13:56 +01:00
Jenkins for ownCloud
bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
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