summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-116-18/+580
* Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-term...Roeland Jago Douma2017-08-106-4/+66
|\
| * Use the existing array of OC versionsJoas Schilling2017-08-071-3/+1
| * Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-08-075-1/+65
* | Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-at...Morris Jobke2017-08-103-20/+7
|\ \
| * | fix phpdoc return types (no code change)Arthur Schiwon2017-07-212-4/+4
| * | do not attempt to recognise cert issue by using LDAPTLS_REQCERTArthur Schiwon2017-07-211-16/+3
* | | Merge pull request #6065 from nextcloud/mysql5.5Morris Jobke2017-08-101-1/+44
|\ \ \
| * | | Add CI job for mysql 5.5Morris Jobke2017-08-101-1/+44
* | | | Merge pull request #5981 from nextcloud/fix-preview-of-themingRoeland Jago Douma2017-08-108-33/+314
|\ \ \ \ | |/ / / |/| | |
| * | | Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| * | | Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| * | | Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| * | | Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| * | | Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| * | | Add acceptance tests for setting the color in the Theming appDaniel Calviño Sánchez2017-08-104-0/+187
| * | | Add getter for the timeout multiplierDaniel Calviño Sánchez2017-08-101-0/+9
* | | | Merge pull request #6056 from nextcloud/mysql5.6Roeland Jago Douma2017-08-101-1/+44
|\ \ \ \ | |/ / / |/| | |
| * | | Add CI job for mysql 5.6Morris Jobke2017-08-091-1/+44
* | | | Merge pull request #6052 from nextcloud/fix_jail_copyMorris Jobke2017-08-101-0/+6
|\ \ \ \
| * | | | Fix copy from jailed storageRoeland Jago Douma2017-08-091-0/+6
* | | | | Merge pull request #6057 from nextcloud/fix-require-onceRoeland Jago Douma2017-08-101-1/+1
|\ \ \ \ \
| * | | | | Fix require once for actionIncludeMorris Jobke2017-08-091-1/+1
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2017-08-106-0/+22
|/ / / /
* | | | Merge pull request #6051 from nextcloud/redis-clusterMorris Jobke2017-08-091-4/+3
|\ \ \ \
| * | | | Fix redis-cluster support on droneMorris Jobke2017-08-091-4/+3
|/ / / /
* | | | Merge pull request #5791 from nextcloud/add-php7.2-testsMorris Jobke2017-08-0916-21/+81
|\ \ \ \
| * | | | Fix ldap testsRoeland Jago Douma2017-08-092-0/+11
| * | | | Fix files_sharing CacheTestsRoeland Jago Douma2017-08-091-2/+2
| * | | | Fix SessionTestRoeland Jago Douma2017-08-091-0/+11
| * | | | Fix RepairMimeTypeTestRoeland Jago Douma2017-08-091-4/+10
| * | | | Fix CacheTestRoeland Jago Douma2017-08-091-2/+2
| * | | | Fix LostControllerTestRoeland Jago Douma2017-08-091-0/+4
| * | | | If there is no content don't errorRoeland Jago Douma2017-08-091-1/+1
| * | | | User proper anonymous functionRoeland Jago Douma2017-08-091-5/+6
| * | | | Fix encryption testRoeland Jago Douma2017-08-091-2/+3
| * | | | Fix LoginControllerRoeland Jago Douma2017-08-091-0/+4
| * | | | Use non-deprecated INTL_IDNA_VARIANT_UTS46Lukas Reschke2017-08-092-3/+3
| * | | | Make definition compatibleLukas Reschke2017-08-091-1/+1
| * | | | Update PHP 7.2 containerLukas Reschke2017-08-091-2/+2
| * | | | Make declaration compatibleLukas Reschke2017-08-091-1/+1
| * | | | Add PHP 7.2 testing containerLukas Reschke2017-08-091-0/+22
|/ / / /
* | | | Merge pull request #6047 from nextcloud/fix-6017-select-indexed-columnsMorris Jobke2017-08-091-2/+2
|\ \ \ \
| * | | | Use indexed column path_hash to find the parentJoas Schilling2017-08-091-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6031 from nextcloud/master-5937Morris Jobke2017-08-093-16/+30
|\ \ \ \
| * | | | Display success and error iconsMarin Treselj2017-08-092-7/+7
| * | | | display error icon on non-successMaxence Lange2017-08-083-11/+25
| | |/ / | |/| |
* | | | Merge pull request #6048 from nextcloud/fix-migration-generationMorris Jobke2017-08-091-1/+1
|\ \ \ \
| * | | | Fix typo in template for migration generationJoas Schilling2017-08-091-1/+1
| | |/ / | |/| |
* | | | Merge pull request #6009 from nextcloud/symfony_translationsMorris Jobke2017-08-094-37/+6
|\ \ \ \