Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixes #23020 | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
* | Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
|\ | |||||
| * | Fix syncing of all birthday calendars in one go | Joas Schilling | 2016-03-09 | 1 | -1/+1 |
* | | Merge pull request #22967 from Aeyoun/master | Thomas Müller | 2016-03-09 | 3 | -3/+3 |
|\ \ | |||||
| * | | Stupid clients only literally understand rel="icon" | Daniel Aleksandersen | 2016-03-08 | 3 | -3/+3 |
* | | | Merge pull request #23026 from stweil/master | Thomas Müller | 2016-03-09 | 5 | -6/+6 |
|\ \ \ | |||||
| * | | | apps/files: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-09 | 5 | -6/+6 |
* | | | | Merge pull request #23032 from owncloud/basephp-showclierror | Thomas Müller | 2016-03-09 | 1 | -1/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Do not set response status in CLI in case of error | Vincent Petry | 2016-03-09 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #22602 from owncloud/fix_slow_chunkcheck | Thomas Müller | 2016-03-09 | 4 | -5/+115 |
|\ \ \ | |||||
| * | | | Added tests | Roeland Jago Douma | 2016-03-07 | 3 | -0/+108 |
| * | | | Do not check all chunks of a chunked upload if we do not need to | Roeland Jago Douma | 2016-03-07 | 1 | -5/+7 |
* | | | | Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove disabled autocorrect for new file names | Morris Jobke | 2016-03-09 | 1 | -1/+1 |
* | | | | Merge pull request #23006 from owncloud/require-xml-reader | Thomas Müller | 2016-03-09 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Add XMLReader as requirement | Lukas Reschke | 2016-03-09 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge pull request #22831 from owncloud/bump_polyfill | Thomas Müller | 2016-03-09 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | [3rdparty] Bump symfony/polyfill-php* to 1.1.0 | Roeland Jago Douma | 2016-03-08 | 1 | -0/+0 |
* | | | | | Merge pull request #23008 from owncloud/only_query_file_folder_shares | Thomas Müller | 2016-03-09 | 1 | -10/+51 |
|\ \ \ \ \ | |||||
| * | | | | | Select queries in the default share provider should query for file/folder | Roeland Jago Douma | 2016-03-09 | 1 | -10/+51 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length... | Thomas Müller | 2016-03-09 | 2 | -2/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Public link share disabled if password length is equal to 0 | prastut | 2016-03-08 | 2 | -2/+12 |
* | | | | | | Merge pull request #22951 from owncloud/fix_int | Thomas Müller | 2016-03-09 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix capabilities intergration tests | Roeland Jago Douma | 2016-03-08 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54 | Thomas Müller | 2016-03-09 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix compatibility with PHP 5.4 | Lukas Reschke | 2016-03-08 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-co... | Thomas Müller | 2016-03-09 | 1 | -27/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use HTTPClient instead of file_get_contents | Lukas Reschke | 2016-03-08 | 1 | -27/+23 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun | Thomas Müller | 2016-03-09 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Use "hasKey" instead of checking the value | Lukas Reschke | 2016-03-08 | 1 | -2/+2 |
| |/ / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-09 | 28 | -8/+124 |
|/ / / / | |||||
* | | | | Merge pull request #22950 from owncloud/fixsharemountrecursion | Roeland Douma | 2016-03-08 | 3 | -3/+10 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix share mounting recursion | Vincent Petry | 2016-03-08 | 3 | -3/+10 |
|/ / / | |||||
* | | | Merge pull request #22936 from owncloud/fix-group-share-migration-for-calenda... | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
|\ \ \ | |||||
| * | | | Fix group sharing and sharing permissions - fixes #22932 | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
* | | | | Merge pull request #22814 from owncloud/delete-empty-file | Thomas Müller | 2016-03-08 | 1 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Delete empty file | Lukas Reschke | 2016-03-03 | 1 | -0/+0 |
* | | | | Merge pull request #22800 from owncloud/fix-20536 | Thomas Müller | 2016-03-08 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | don't hide server not available exception, fixes #20536 | Arthur Schiwon | 2016-03-03 | 1 | -0/+3 |
* | | | | | Merge pull request #22885 from owncloud/master-show-version-to-update-to | Thomas Müller | 2016-03-08 | 2 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Show version to update to properly | Lukas Reschke | 2016-03-05 | 2 | -3/+6 |
* | | | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_api | Thomas Müller | 2016-03-08 | 1 | -57/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Can't convert node to string | Roeland Jago Douma | 2016-03-07 | 1 | -1/+6 |
| * | | | | | | Move common code to function | Roeland Jago Douma | 2016-03-07 | 1 | -56/+31 |
* | | | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-name | Thomas Müller | 2016-03-08 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove double URL encoding | Lukas Reschke | 2016-03-07 | 1 | -4/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-08 | 36 | -24/+130 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #22921 from owncloud/add-before-command | Thomas Müller | 2016-03-07 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Initialize submodules for Scrutinizer as well | Lukas Reschke | 2016-03-07 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #22880 from owncloud/fix-21656 | Thomas Müller | 2016-03-07 | 2 | -1/+4 |
|\ \ \ \ \ |