summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-2560-108/+414
|
* Merge pull request #6244 from nextcloud/redis_clusterMorris Jobke2017-08-251-1/+2
|\ | | | | [drone] Give redis a change to fireup
| * Use a new phpredisRoeland Jago Douma2017-08-241-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Give redis a change to fireupRoeland Jago Douma2017-08-231-0/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6249 from nextcloud/ignore-vscodeRoeland Jago Douma2017-08-241-0/+3
|\ \ | | | | | | Add Visual Studio Code to .gitignore
| * | Add Visual Studio Code to .gitignoreJakob Sack2017-08-241-0/+3
| | |
* | | Merge pull request #6251 from nextcloud/get_right_translationRoeland Jago Douma2017-08-241-1/+1
|\ \ \ | | | | | | | | Don't fetch the translation from core but from files
| * | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-241-1/+1
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-247-28/+229
|\ \ \ | | | | | | | | extend the identity proof manager to allow system wide key pairs
| * | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump versionRoeland Jago Douma2017-08-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-104-8/+122
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-103-23/+108
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #6241 from nextcloud/integration_ramMorris Jobke2017-08-241-25/+25
|\ \ \ \ | |_|/ / |/| | | [drone] Install intergration tests in RAM
| * | | [drone] Install intergration tests in RAMRoeland Jago Douma2017-08-241-25/+25
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-24100-364/+562
| | | |
* | | | Merge pull request #6239 from nextcloud/fix-uploading-messageRoeland Jago Douma2017-08-232-3/+7
|\ \ \ \ | |_|_|/ |/| | | Show "Uploading..." in web UI for long uploads
| * | | Replace ... with …Morris Jobke2017-08-232-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Show "Uploading..." in web UI for long uploadsMorris Jobke2017-08-231-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | If the estimated upload time is bigger than 4 hours it shows the text "Uploading..." because the time then doesn't give any good hint to the user anyways. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failedRoeland Jago Douma2017-08-233-3/+29
|\ \ \ | | | | | | | | Prevent SQL error message in case of error
| * | | Prevent SQL error message in case of errorLukas Reschke2017-08-173-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than permitted in the database. This is against it's PHPDocs and we should cast this to `false`, so that the regular error handling triggers in. The easiest way to reproduce is on MySQL: 1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel 2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again 3. See SQL exception as error message Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #6165 from nextcloud/bump-dompurifyMorris Jobke2017-08-233-10/+12
|\ \ \ \ | |_|/ / |/| | | Bump DOMPurify
| * | | Bump merged JSLukas Reschke2017-08-171-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Bump DOMPurify to 1.0.0Lukas Reschke2017-08-172-8/+9
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #6236 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-1/+0
|\ \ \ \ | | | | | | | | | | Fix phan test
| * | | | Fix phan testMorris Jobke2017-08-231-1/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6229 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-71/+76
|\ \ \ \ | | | | | | | | | | Use docker images without XDebug and with Opcache
| * | | | Use docker images without XDebug and with OpcacheMorris Jobke2017-08-231-71/+76
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6218 from nextcloud/sabre-xml-fixMorris Jobke2017-08-231-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | [3rdparty] Fix sabre/xml empty prop parsing
| * | | | [3rdparty] Fix sabre/xml empty prop parsingRoeland Jago Douma2017-08-221-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-236-0/+14
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-2294-346/+464
| | | |
* | | | Merge pull request #6149 from nextcloud/downstream-26539Morris Jobke2017-08-21147-244502/+2
|\ \ \ \ | | | | | | | | | | Downstream 26539 & 28074 - proper handling of invalid config
| * | | | Move GDrive external storage to a separate repoVincent Petry2017-08-21147-244502/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6179 from nextcloud/no-password-reset-for-disabled-usersMorris Jobke2017-08-212-3/+41
|\ \ \ \ \ | | | | | | | | | | | | No password reset for disabled users
| * | | | | No password reset for disabled usersJoas Schilling2017-08-182-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #6201 from nextcloud/dropdown-contrastMorris Jobke2017-08-212-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Increase contrast of dropdown menu text, fix accessibility & visibility issues
| * | | | | | Increase contrast of dropdown menu text, fix accessibility & visibility issuesJan-Christoph Borchardt2017-08-212-10/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #6169 from nextcloud/check-encoding-logLukas Reschke2017-08-211-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure log message is UTF-8 encoded
| * | | | | | Ensure log message is UTF-8 encodedLukas Reschke2017-08-171-1/+12
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP's json_encode only accept proper UTF-8 strings, loop over all elements to ensure that they are properly UTF-8 compliant or convert them manually. Without this somebody passing an invalid User Agent may make json_encode return false which will get logged as empty newline. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #6194 from nextcloud/proper-l10n-for-app-passwordsMorris Jobke2017-08-211-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use correct l10n for app password menu
| * | | | | Use correct l10n for app password menuMorris Jobke2017-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6180 from nextcloud/fix-warningsMorris Jobke2017-08-211-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix PHPUnit warnings
| * | | | | Fix PHPUnit warningsLukas Reschke2017-08-181-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 1) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #0 (true) PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead 2) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #1 (false) PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead 3) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetSection PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead 4) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetPriority PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2132-74/+1072
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2022-88/+252
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-1930-84/+270
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1832-6/+124
| | | |
* | | | Merge pull request #6161 from nextcloud/drone-s3Morris Jobke2017-08-173-357/+3
|\ \ \ \ | |/ / / |/| | | Enable S3 tests on drone again
| * | | Enable object storage tests againMorris Jobke2017-08-172-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 09:21:10 +0000