Commit Graph

30938 Commits

Author SHA1 Message Date
Lukas Reschke bc4a043a76 Add base rewrite rule only when RewriteBase is defined
In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
2016-03-09 15:13:07 +01:00
Thomas Müller eff17fd3b7 Merge pull request #23008 from owncloud/only_query_file_folder_shares
Select queries in the default share provider should query for file/folder
2016-03-09 13:43:36 +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 879d51b3e8 Merge pull request #22951 from owncloud/fix_int
Fix capabilities intergration tests
2016-03-09 12:21:43 +01:00
Thomas Müller 447e8d2313 Merge pull request #22961 from owncloud/fix-gdrive-on-php54
Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +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
Roeland Jago Douma e8f22a16f6 Select queries in the default share provider should query for file/folder
There can be leftover calendar and contacts shares in the oc_share
table. We need to filter those out properly.
2016-03-09 11:19:57 +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
Roeland Douma 8c8ff0eae7 Merge pull request #22950 from owncloud/fixsharemountrecursion
Fix share mounting recursion
2016-03-08 19:28:09 +01:00
Lukas Reschke d14adb2351 Fix compatibility with PHP 5.4
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Roeland Jago Douma 0b4ff1a9e3 Fix capabilities intergration tests
Split the array element selection and the member selection.
2016-03-08 15:13:15 +01:00
Vincent Petry e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller 15833d9843 Merge pull request #22936 from owncloud/fix-group-share-migration-for-calendars-and-contacts
Fix migration of group shared calendars and addressbooks
2016-03-08 14:33:34 +01:00
Thomas Müller 20db92c71a Fix group sharing and sharing permissions - fixes #22932 2016-03-08 11:22:07 +01:00
Thomas Müller c40cb975a8 Merge pull request #22814 from owncloud/delete-empty-file
Delete empty file
2016-03-08 11:02:34 +01:00
Thomas Müller 6acde90e2c Merge pull request #22800 from owncloud/fix-20536
don't hide server not available exception, fixes #20536
2016-03-08 09:58:26 +01:00
Thomas Müller 31c89bd3a2 Merge pull request #22885 from owncloud/master-show-version-to-update-to
Show version to update to properly
2016-03-08 09:41:52 +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
Thomas Müller 21b6bd321d Merge pull request #22918 from owncloud/remove-double-encoding-in-name
Remove double URL encoding
2016-03-08 09:40:27 +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
Thomas Müller 9f0711004f Merge pull request #22921 from owncloud/add-before-command
Initialize submodules for Scrutinizer as well
2016-03-07 22:47:24 +01:00
Lukas Reschke 81cda800be Initialize submodules for Scrutinizer as well
Scrutinizer otherwise complains about the fact that some classes are undefined etc.

Let's see whether that works 😄
2016-03-07 20:52:58 +01:00
Lukas Reschke 1fd76b6379 Remove double URL encoding
ZipStreamer as bundled with 9.0 will properly encode the filename already.

Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
2016-03-07 19:29:15 +01:00
Thomas Müller 0487b541a0 Merge pull request #22880 from owncloud/fix-21656
improve log output when no LDAP user was found on login attempt
2016-03-07 17:12:01 +01:00
Thomas Müller d43d95e0fd Merge pull request #22911 from owncloud/fix-failing-migration
Handle calendar migration issue by writing the faulty event to the lo…
2016-03-07 16:41:12 +01:00
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
Thomas Müller 19dc02b8e0 Merge pull request #22900 from owncloud/diskfreespace-filesworkaround
Fix call to disk_free_space when a file is provided
2016-03-07 15:07:31 +01:00
Thomas Müller deca1979aa Calendar and addressbook migration commands are always available 2016-03-07 15:04:19 +01:00
Thomas Müller 3b25ccef65 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller d32b35fc7f Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller a61fa5b526 Merge pull request #22902 from owncloud/share-archivenamedownloadall
Fix archive file name when downloading public share
2016-03-07 14:47:35 +01:00
Thomas Müller 8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
Fix uploading to fed share when free space is unlimited
2016-03-07 14:47:01 +01:00
Thomas Müller 4324d302bc Merge pull request #22872 from owncloud/password-change-tooltip-text
Update error text for link passwords
2016-03-07 14:46:27 +01:00
Thomas Müller 67a58d663d Merge pull request #22815 from prastut/feature-enhance-loginflow
Trigger login if remember_login checked
2016-03-07 14:46:08 +01:00
Thomas Müller fa436b5b0c Merge pull request #22812 from owncloud/node-lock
Add locking to the node api
2016-03-07 14:43:49 +01:00
Thomas Müller e5b5eca5a9 Merge pull request #22787 from owncloud/versions-fixmtimetooltip
Fix tooltip for versions mtime
2016-03-07 14:41:46 +01:00
Thomas Müller 46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401
Return false on 401 in file list + trash file list
2016-03-07 14:41:31 +01:00
Thomas Müller bd4b61f52b Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint
Correctly default to null and add type hint
2016-03-07 13:50:53 +01:00
Thomas Müller 3b7a59f66b Merge pull request #22904 from owncloud/get-user-groups-should-return-an-array
Make sure that the return value is an array
2016-03-07 12:52:25 +01:00
Thomas Müller 296a46cc38 Merge pull request #22244 from owncloud/dont-update-shared-resource-properties
For 9.0 we don't have the possibility to store calendar and addressbo…
2016-03-07 12:42:52 +01:00
Joas Schilling 69d7097a1a Make sure that the return value is an array 2016-03-07 11:57:05 +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
Vincent Petry 89881ed511 Fix call to disk_free_space when a file is provided
In the case of shared files, we have to call free_space() on the file
name. This has the side-effect that when uploading to a local storage
without quota set, it will call disk_free_space with the file name,
which fails.

This fix uses the parent folder in case the given path is a file.
2016-03-07 11:01:24 +01:00
Joas Schilling c99ae62c33 Correctly default to null and add type hint 2016-03-07 10:48:16 +01:00