aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | do not attempt to recognise cert issue by using LDAPTLS_REQCERTArthur Schiwon2017-07-211-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first, it does not work (at least not everywhere/reliably), second if it did it was not reset properly. Removes a bit of complexity. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #6065 from nextcloud/mysql5.5Morris Jobke2017-08-101-1/+44
|\ \ \ \ \ | | | | | | | | | | | | Add CI job for mysql 5.5
| * | | | | Add CI job for mysql 5.5Morris Jobke2017-08-101-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5981 from nextcloud/fix-preview-of-themingRoeland Jago Douma2017-08-108-33/+314
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix preview of theming
| * | | | | Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following change in which reloadStylesheets will have to be able to receive absolute URLs. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist. The "server.css" URL must be known by the Theming app in order to update the stylesheets when previewing the changes to the theme, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). The "server.css" URL provided by the response will be taken into account by the JavaScript front-end in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following commit in which the properties present in the response will change depending on whether the request was successful or not. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add acceptance tests for setting the color in the Theming appDaniel Calviño Sánchez2017-08-104-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add getter for the timeout multiplierDaniel Calviño Sánchez2017-08-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the acceptance tests have to explicitly wait for something to happen without using the "find" method from the actor; in those cases the timeout multiplier needs to be taken into account too, so the test cases must be able to retrieve it from the actor. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #6056 from nextcloud/mysql5.6Roeland Jago Douma2017-08-101-1/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add CI job for mysql 5.6
| * | | | | Add CI job for mysql 5.6Morris Jobke2017-08-091-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6052 from nextcloud/fix_jail_copyMorris Jobke2017-08-101-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix copy from jailed storage
| * | | | | Fix copy from jailed storageRoeland Jago Douma2017-08-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a jailed storage we must also fix the internal path on copy. Else we pass in the wrong path. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #6057 from nextcloud/fix-require-onceRoeland Jago Douma2017-08-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix require once for actionInclude
| * | | | | | Fix require once for actionIncludeMorris Jobke2017-08-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * regression from #5791 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / | | | | [tx-robot] updated from transifexNextcloud bot2017-08-106-0/+22
|/ / / / /
* | | | | Merge pull request #6051 from nextcloud/redis-clusterMorris Jobke2017-08-091-4/+3
|\ \ \ \ \ | | | | | | | | | | | | Enable redis cluster CI step
| * | | | | Fix redis-cluster support on droneMorris Jobke2017-08-091-4/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5791 from nextcloud/add-php7.2-testsMorris Jobke2017-08-0916-21/+81
|\ \ \ \ \ | | | | | | | | | | | | [CI] Add PHP 7.2 testing container
| * | | | | Fix ldap testsRoeland Jago Douma2017-08-092-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix files_sharing CacheTestsRoeland Jago Douma2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix SessionTestRoeland Jago Douma2017-08-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix RepairMimeTypeTestRoeland Jago Douma2017-08-091-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix CacheTestRoeland Jago Douma2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix LostControllerTestRoeland Jago Douma2017-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | If there is no content don't errorRoeland Jago Douma2017-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | User proper anonymous functionRoeland Jago Douma2017-08-091-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix encryption testRoeland Jago Douma2017-08-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix LoginControllerRoeland Jago Douma2017-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Use non-deprecated INTL_IDNA_VARIANT_UTS46Lukas Reschke2017-08-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Make definition compatibleLukas Reschke2017-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Update PHP 7.2 containerLukas Reschke2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Make declaration compatibleLukas Reschke2017-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add PHP 7.2 testing containerLukas Reschke2017-08-091-0/+22
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #6047 from nextcloud/fix-6017-select-indexed-columnsMorris Jobke2017-08-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use indexed column path_hash to find the parent
| * | | | | Use indexed column path_hash to find the parentJoas Schilling2017-08-091-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6031 from nextcloud/master-5937Morris Jobke2017-08-093-16/+30
|\ \ \ \ \ | | | | | | | | | | | | display error icon on non-success
| * | | | | Display success and error iconsMarin Treselj2017-08-092-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | display error icon on non-successMaxence Lange2017-08-083-11/+25
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | Merge pull request #6048 from nextcloud/fix-migration-generationMorris Jobke2017-08-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in template for migration generation
| * | | | | Fix typo in template for migration generationJoas Schilling2017-08-091-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6009 from nextcloud/symfony_translationsMorris Jobke2017-08-094-37/+6
|\ \ \ \ \ | | | | | | | | | | | | Use symfony/translation for L10N plurals
| * | | | | Use symfony/translation for L10N pluralsRoeland Jago Douma2017-08-074-37/+6
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #6049 from nextcloud/drone-updateMorris Jobke2017-08-091-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Update syntax to drone 0.8
| * | | | | Update syntax to drone 0.8Morris Jobke2017-08-091-2/+4
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-09574-862/+462
| | | | |
* | | | | Merge pull request #5982 from ↵Lukas Reschke2017-08-081-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/fix-loading-icon-inside-upload-button-in-theming-app Fix loading icon inside upload button in Theming app
| * | | | Fix loading icon inside upload button in Theming appDaniel Calviño Sánchez2017-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5969 fixed the vertical alignment of loading icon and status message in Theming app, but in doing so it broke the loading icon inside the upload button. When an image is being uploaded the upload icon is replaced by a loading icon, so the loading icon and the upload icon have to share their CSS rules, but only in that specific case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 23:07:24 +0000