aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixes #23020Thomas Müller2016-03-091-1/+1
* 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 goJoas Schilling2016-03-091-1/+1
* | Merge pull request #22967 from Aeyoun/masterThomas Müller2016-03-093-3/+3
|\ \
| * | Stupid clients only literally understand rel="icon"Daniel Aleksandersen2016-03-083-3/+3
* | | Merge pull request #23026 from stweil/masterThomas Müller2016-03-095-6/+6
|\ \ \
| * | | apps/files: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-095-6/+6
* | | | Merge pull request #23032 from owncloud/basephp-showclierrorThomas Müller2016-03-091-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \
| * | | Added testsRoeland Jago Douma2016-03-073-0/+108
| * | | Do not check all chunks of a chunked upload if we do not need toRoeland Jago Douma2016-03-071-5/+7
* | | | Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-fileThomas Müller2016-03-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove disabled autocorrect for new file namesMorris Jobke2016-03-091-1/+1
* | | | Merge pull request #23006 from owncloud/require-xml-readerThomas Müller2016-03-091-1/+2
|\ \ \ \
| * | | | Add XMLReader as requirementLukas Reschke2016-03-091-1/+2
| |/ / /
* | | | Merge pull request #22831 from owncloud/bump_polyfillThomas Müller2016-03-091-0/+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/folderRoeland Jago Douma2016-03-091-10/+51
| | |/ / / | |/| | |
* | | | | Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length...Thomas Müller2016-03-092-2/+12
|\ \ \ \ \
| * | | | | 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 testsRoeland Jago Douma2016-03-081-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54Thomas Müller2016-03-091-1/+2
|\ \ \ \ \ \
| * | | | | | Fix compatibility with PHP 5.4Lukas Reschke2016-03-081-1/+2
| |/ / / / /
* | | | | | Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-co...Thomas Müller2016-03-091-27/+23
|\ \ \ \ \ \
| * | | | | | Use HTTPClient instead of file_get_contentsLukas Reschke2016-03-081-27/+23
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-funThomas Müller2016-03-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use "hasKey" instead of checking the valueLukas Reschke2016-03-081-2/+2
| |/ / / /
* / / / / [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 recursionVincent Petry2016-03-083-3/+10
|/ / /
* | | Merge pull request #22936 from owncloud/fix-group-share-migration-for-calenda...Thomas Müller2016-03-085-18/+31
|\ \ \
| * | | 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 fileLukas Reschke2016-03-031-0/+0
* | | | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \ \ \
| * | | | 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 properlyLukas Reschke2016-03-052-3/+6
* | | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ \ \ \ \
| * | | | | | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| * | | | | | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
* | | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [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 wellLukas Reschke2016-03-071-0/+3
|/ / / / /
* | | | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ \ \