summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-1012-18/+24
|
* Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendarsThomas Müller2016-03-091-1/+1
|\ | | | | Fix syncing of all birthday calendars in one go
| * Fix syncing of all birthday calendars in one goJoas Schilling2016-03-091-1/+1
| |
* | Merge pull request #22967 from Aeyoun/masterThomas Müller2016-03-093-3/+3
|\ \ | | | | | | Change rel="shortcut icon" to the standard rel="icon"
| * | Stupid clients only literally understand rel="icon"Daniel Aleksandersen2016-03-083-3/+3
| | | | | | | | | | | | | | | | | | rel="shortcut icon" hasn’t been relevant in years, isn’t in any standards, and causes problems for simple pattern matching clients. https://www.w3.org/TR/html/links.html#linkTypes
* | | Merge pull request #23026 from stweil/masterThomas Müller2016-03-095-6/+6
|\ \ \ | | | | | | | | apps/files: Fix typos in comments (found and fixed by codespell)
| * | | apps/files: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-095-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This contribution is AGPL and MIT licensed. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | Merge pull request #23032 from owncloud/basephp-showclierrorThomas Müller2016-03-091-1/+3
|\ \ \ \ | |_|_|/ |/| | | Do not set response status in CLI in case of error
| * | | Do not set response status in CLI in case of errorVincent Petry2016-03-091-1/+3
|/ / /
* | | Merge pull request #22602 from owncloud/fix_slow_chunkcheckThomas Müller2016-03-094-5/+115
|\ \ \ | | | | | | | | Do not check all chunks of a chunked upload if we do not need to
| * | | Added testsRoeland Jago Douma2016-03-073-0/+108
| | | | | | | | | | | | | | | | | | | | * Unit tests for OC_Filechunking to verify the isComplete function * Intergration tests to show that shuffling chunks is all fine
| * | | Do not check all chunks of a chunked upload if we do not need toRoeland Jago Douma2016-03-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22601 Before we did a full test on all chunks to verify if a chunked upload was completed. This is unneeded since if we are missing one chunk we can already fail. Also we look from back to front since it is much more likely that we find a missing chunk thus can error out early.
* | | | Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-fileThomas Müller2016-03-091-1/+1
|\ \ \ \ | |_|/ / |/| | | Remove disabled autocorrect for new file names
| * | | Remove disabled autocorrect for new file namesMorris Jobke2016-03-091-1/+1
| | | | | | | | | | | | | | | | * ref #22784
* | | | Merge pull request #23006 from owncloud/require-xml-readerThomas Müller2016-03-091-1/+2
|\ \ \ \ | | | | | | | | | | Add XMLReader as requirement
| * | | | Add XMLReader as requirementLukas Reschke2016-03-091-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SabreDAV release in 9.0 requires XMLReader, while this is usually compiled in by default some distributions like Gentoo don't. Without this ownCloud gives a fatal 500 error instead of telling people to enable XMLReader. Fixes https://github.com/owncloud/core/issues/23003
* | | | Merge pull request #22831 from owncloud/bump_polyfillThomas Müller2016-03-091-0/+0
|\ \ \ \ | | | | | | | | | | [3rdparty] Bump symfony/polyfill-php* to 1.1.0
| * | | | [3rdparty] Bump symfony/polyfill-php* to 1.1.0Roeland Jago Douma2016-03-081-0/+0
| | | | |
* | | | | Merge pull request #23008 from owncloud/only_query_file_folder_sharesThomas Müller2016-03-091-10/+51
|\ \ \ \ \ | | | | | | | | | | | | Select queries in the default share provider should query for file/folder
| * | | | | Select queries in the default share provider should query for file/folderRoeland Jago Douma2016-03-091-10/+51
| | |/ / / | |/| | | | | | | | | | | | | | | | | | There can be leftover calendar and contacts shares in the oc_share table. We need to filter those out properly.
* | | | | Merge pull request #22930 from ↵Thomas Müller2016-03-092-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/bugfix-submit-disable-password-length-zero Public link share disabled if password length is equal to 0
| * | | | | Public link share disabled if password length is equal to 0prastut2016-03-082-2/+12
| | | | | |
* | | | | | Merge pull request #22951 from owncloud/fix_intThomas Müller2016-03-091-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix capabilities intergration tests
| * | | | | | Fix capabilities intergration testsRoeland Jago Douma2016-03-081-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Split the array element selection and the member selection.
* | | | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54Thomas Müller2016-03-091-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix compatibility with PHP 5.4
| * | | | | | Fix compatibility with PHP 5.4Lukas Reschke2016-03-081-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22960
* | | | | | Merge pull request #22972 from ↵Thomas Müller2016-03-091-27/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/use-httpclient-instead-of-file-get-contents Use HTTPClient instead of file_get_contents
| * | | | | | Use HTTPClient instead of file_get_contentsLukas Reschke2016-03-081-27/+23
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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\/"} ```
* | | | | | Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-funThomas Müller2016-03-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Use "hasKey" instead of checking the value
| * | | | | Use "hasKey" instead of checking the valueLukas Reschke2016-03-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | 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.
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0928-8/+124
|/ / / /
* | | | Merge pull request #22950 from owncloud/fixsharemountrecursionRoeland Douma2016-03-083-3/+10
|\ \ \ \ | |/ / / |/| | | Fix share mounting recursion
| * | | Fix share mounting recursionVincent Petry2016-03-083-3/+10
|/ / /
* | | Merge pull request #22936 from ↵Thomas Müller2016-03-085-18/+31
|\ \ \ | | | | | | | | | | | | | | | | owncloud/fix-group-share-migration-for-calendars-and-contacts Fix migration of group shared calendars and addressbooks
| * | | Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
| | | |
* | | | Merge pull request #22814 from owncloud/delete-empty-fileThomas Müller2016-03-081-0/+0
|\ \ \ \ | |/ / / |/| | | Delete empty file
| * | | Delete empty fileLukas Reschke2016-03-031-0/+0
| | | | | | | | | | | | Ref https://github.com/owncloud/core/issues/22803#issuecomment-191749499
* | | | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \ \ \ | | | | | | | | | | don't hide server not available exception, fixes #20536
| * | | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-031-0/+3
| | | | |
* | | | | Merge pull request #22885 from owncloud/master-show-version-to-update-toThomas Müller2016-03-082-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Show version to update to properly
| * | | | | Show version to update to properlyLukas Reschke2016-03-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Properly shows the version that will be updated to.
* | | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup OCS Share Api
| * | | | | | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| | | | | | |
| * | | | | | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to get a share by id is somewhat messy. And was duplicated. Now this is done is a separate function
* | | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove double URL encoding
| * | | | | | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZipStreamer as bundled with 9.0 will properly encode the filename already. Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0836-24/+130
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #22921 from owncloud/add-before-commandThomas Müller2016-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Initialize submodules for Scrutinizer as well
| * | | | | Initialize submodules for Scrutinizer as wellLukas Reschke2016-03-071-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | Scrutinizer otherwise complains about the fact that some classes are undefined etc. Let's see whether that works :smile:
* | | | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ \ \ | | | | | | | | | | | | improve log output when no LDAP user was found on login attempt