aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix failing preview unit tests (#26039)Thomas Müller2016-09-122-22/+22
* Merge pull request #1373 from nextcloud/upstream-26091Joas Schilling2016-09-122-41/+7
|\
| * add updated composer autoloader codeMorris Jobke2016-09-121-5/+7
| * Clean up code coverageThomas Müller2016-09-121-36/+0
* | Merge pull request #1369 from nextcloud/georgehrke-readme-patch-1Morris Jobke2016-09-121-2/+2
|\ \
| * | replace he with they in readmeGeorg Ehrke2016-09-121-2/+2
| |/
* | Merge pull request #1359 from nextcloud/cache_controller_nameJoas Schilling2016-09-121-1/+15
|\ \ | |/ |/|
| * Cache the build ControllerNameRoeland Jago Douma2016-09-111-1/+15
* | [tx-robot] updated from transifexNextcloud bot2016-09-1212-0/+76
* | Merge pull request #1351 from nextcloud/cast_to_intMorris Jobke2016-09-112-2/+2
|\ \
| * | Cast query result to intRoeland Jago Douma2016-09-092-2/+2
* | | Merge pull request #1250 from nextcloud/remote_ocsRoeland Jago Douma2016-09-114-260/+217
|\ \ \
| * | | Move remote_shares OCS endpoint to AppFrameworkRoeland Jago Douma2016-09-094-260/+217
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-1110-0/+12
| |_|/ |/| |
* | | Merge pull request #1346 from nextcloud/trash-detect-correct-mimetypeRoeland Jago Douma2016-09-101-2/+3
|\ \ \
| * | | detect the correct mimetype of the files in the trashbin, therefore we have t...Bjoern Schiessle2016-09-091-2/+3
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-1010-56/+66
| |_|/ |/| |
* | | Merge pull request #1342 from nextcloud/throw-exceptions-not-printableMorris Jobke2016-09-092-7/+5
|\ \ \ | |/ / |/| |
| * | Don't print exception message in HTMLLukas Reschke2016-09-092-7/+5
| |/
* | Merge pull request #1339 from nextcloud/master-limit-possible-image-mimetypesMorris Jobke2016-09-092-9/+63
|\ \ | |/ |/|
| * Filter more mimetypesLukas Reschke2016-09-092-9/+63
|/
* [tx-robot] updated from transifexNextcloud bot2016-09-0942-68/+58
* Merge pull request #1317 from nextcloud/add-sharing-disclaimerMorris Jobke2016-09-089-4/+92
|\
| * Adjust testLukas Reschke2016-09-081-1/+7
| * Use l10nLukas Reschke2016-09-081-1/+1
| * Fix testsLukas Reschke2016-09-082-4/+3
| * Adding a optional disclaimer to the anonymous upload pageMorris Jobke2016-09-088-3/+86
* | Merge pull request #1247 from nextcloud/storage-id-global-cacheMorris Jobke2016-09-088-27/+131
|\ \
| * | more efficient querying of numeric storage idsRobin Appelman2016-09-078-27/+131
* | | Merge pull request #1297 from nextcloud/catch-exceptions-with-invalid-passwordsRoeland Jago Douma2016-09-082-6/+19
|\ \ \
| * | | Fix typoJoas Schilling2016-09-071-1/+1
| * | | Catch the exception of the password policy appJoas Schilling2016-09-072-5/+18
* | | | Merge pull request #1328 from nextcloud/add-exemption-for-osxMorris Jobke2016-09-081-1/+15
|\ \ \ \
| * | | | Add exemptions for incompatible UAsLukas Reschke2016-09-081-1/+15
* | | | | Merge pull request #1323 from nextcloud/show-download-button-for-updates-atmMorris Jobke2016-09-089-48/+36
|\ \ \ \ \
| * | | | | Change updater URLJoas Schilling2016-09-083-14/+14
| * | | | | Fix testsJoas Schilling2016-09-082-7/+15
| * | | | | Show an update button instead of the updaterJoas Schilling2016-09-084-27/+7
* | | | | | Merge pull request #1318 from nextcloud/11-supports-php7.1Lukas Reschke2016-09-081-8/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Master supports PHP 7.1Lukas Reschke2016-09-081-8/+0
| |/ / / /
* | | | | Merge pull request #1315 from nextcloud/remove_password_compatJoas Schilling2016-09-081-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [3rdparty] PasswordCompat is no longer requiredRoeland Jago Douma2016-09-081-0/+0
|/ / / /
* | | | Merge pull request #836 from nextcloud/php7.1Lukas Reschke2016-09-088-12/+53
|\ \ \ \
| * | | | Compare arrays not json stringsRoeland Jago Douma2016-09-071-6/+31
| * | | | Use the PHP 7.1-3 tagLukas Reschke2016-09-071-2/+2
| * | | | Update 3rdparty refLukas Reschke2016-09-071-0/+0
| * | | | Set defaultRoeland Jago Douma2016-09-072-3/+3
| * | | | Fix intergrity checkerRoeland Jago Douma2016-09-071-1/+5
| * | | | Use updated phpseclib refLukas Reschke2016-09-071-0/+0
| * | | | Initialize array elements properlyThomas Müller2016-09-071-1/+1