mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,284 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

40284 Commits

Author SHA1 Message Date
Roeland Jago Douma 1682ead807 Merge pull request #6260 from nextcloud/popover-border-radius 
Add standard border-radius to datepicker
 2017-08-25 15:58:23 +02:00
Roeland Jago Douma f456462dfd Merge pull request #6261 from nextcloud/fix-favorites-permanent 
Fix permanent display of favorite icon
 2017-08-25 15:57:07 +02:00
Jan-Christoph Borchardt ee69a29f2f Fix permanent display of favorite icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-25 14:25:21 +02:00
Jan-Christoph Borchardt cd1e384b14 Add standard border-radius to datepicker 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-25 14:08:29 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Morris Jobke 15a29717f1 Merge pull request #6244 from nextcloud/redis_cluster 
[drone] Give redis a change to fireup
 2017-08-25 00:17:59 +02:00
Roeland Jago Douma 8b29ea53db Merge pull request #6249 from nextcloud/ignore-vscode 
Add Visual Studio Code to .gitignore
 2017-08-24 19:27:19 +02:00
Roeland Jago Douma f99527ab8b Merge pull request #6251 from nextcloud/get_right_translation 
Don't fetch the translation from core but from files
 2017-08-24 19:24:07 +02:00
Roeland Jago Douma 3d22e7a6f5
Use a new phpredis 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-24 19:01:13 +02:00
Björn Schießle 60ee450809 Merge pull request #5870 from nextcloud/generate-system-wide-key-pair 
extend the identity proof manager to allow system wide key pairs
 2017-08-24 18:36:35 +02:00
Morris Jobke f6f10b5932 Merge pull request #6241 from nextcloud/integration_ram 
[drone] Install intergration tests in RAM
 2017-08-24 17:55:07 +02:00
Roeland Jago Douma 5a9a199aaa
Don't fetch the translation from core but from files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-24 14:54:14 +02:00
Jakob Sack af8d93ac02 Add Visual Studio Code to .gitignore 2017-08-24 14:26:44 +02:00
Roeland Jago Douma 8c02bcdeee
[drone] Install intergration tests in RAM 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-24 11:04:30 +02:00
Nextcloud bot a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Roeland Jago Douma 697fcc93da Merge pull request #6239 from nextcloud/fix-uploading-message 
Show "Uploading..." in web UI for long uploads
 2017-08-23 19:15:58 +02:00
Roeland Jago Douma ef223b7760
Give redis a change to fireup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-23 18:19:22 +02:00
Roeland Jago Douma 9357cf735a Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failed 
Prevent SQL error message in case of error
 2017-08-23 16:49:57 +02:00
Morris Jobke 4225f93818 Merge pull request #6165 from nextcloud/bump-dompurify 
Bump DOMPurify
 2017-08-23 16:35:27 +02:00
Morris Jobke 57fd256b9a
Replace ... with … 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 16:22:11 +02:00
Morris Jobke 591dda2fed
Show "Uploading..." in web UI for long uploads 
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>
 2017-08-23 15:59:05 +02:00
Morris Jobke 08b71ca682 Merge pull request #6236 from nextcloud/drone-ci-images 
Fix phan test
 2017-08-23 15:23:31 +02:00
Morris Jobke e826961a51
Fix phan test 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 15:22:28 +02:00
Morris Jobke cba19b96e8 Merge pull request #6229 from nextcloud/drone-ci-images 
Use docker images without XDebug and with Opcache
 2017-08-23 15:07:44 +02:00
Morris Jobke 0460ee70ef
Use docker images without XDebug and with Opcache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 14:15:13 +02:00
Morris Jobke 4fcd1450be Merge pull request #6218 from nextcloud/sabre-xml-fix 
[3rdparty] Fix sabre/xml empty prop parsing
 2017-08-23 11:18:18 +02:00
Nextcloud bot 782f6e9454
[tx-robot] updated from transifex 2017-08-23 00:08:55 +00:00
Roeland Jago Douma 2fcd555783 [3rdparty] Fix sabre/xml empty prop parsing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-22 19:02:42 +02:00
Nextcloud bot ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Morris Jobke e881e01620 Merge pull request #6149 from nextcloud/downstream-26539 
Downstream 26539 & 28074 - proper handling of invalid config
 2017-08-21 22:11:18 +02:00
Morris Jobke 3168dec332 Merge pull request #6179 from nextcloud/no-password-reset-for-disabled-users 
No password reset for disabled users
 2017-08-21 17:17:32 +02:00
Morris Jobke a891d24176 Merge pull request #6201 from nextcloud/dropdown-contrast 
Increase contrast of dropdown menu text, fix accessibility & visibility issues
 2017-08-21 14:09:26 +02:00
Jan-Christoph Borchardt d35e54074b Increase contrast of dropdown menu text, fix accessibility & visibility issues 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-21 12:06:24 +02:00
Lukas Reschke 223265b369 Merge pull request #6169 from nextcloud/check-encoding-log 
Ensure log message is UTF-8 encoded
 2017-08-21 10:20:52 +02:00
Morris Jobke 2404c854c4 Merge pull request #6194 from nextcloud/proper-l10n-for-app-passwords 
Use correct l10n for app password menu
 2017-08-21 10:04:13 +02:00
Vincent Petry 2cb3461146 Move GDrive external storage to a separate repo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-21 09:59:10 +02:00
Morris Jobke 6e3b8db98d Merge pull request #6180 from nextcloud/fix-warnings 
Fix PHPUnit warnings
 2017-08-21 09:25:35 +02:00
Morris Jobke c134afee40 Use correct l10n for app password menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-21 09:18:49 +02:00
Nextcloud bot 9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot 8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot 6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Lukas Reschke f8b4b2c499
Fix PHPUnit warnings 
```
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>
 2017-08-18 15:39:10 +02:00
Joas Schilling d5c6d56170
No password reset for disabled users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-18 13:21:53 +02:00
Nextcloud bot 231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Morris Jobke 0d956cb4aa Merge pull request #6161 from nextcloud/drone-s3 
Enable S3 tests on drone again
 2017-08-17 19:18:13 +02:00
Lukas Reschke c016b01bf9
Ensure log message is UTF-8 encoded 
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>
 2017-08-17 15:01:50 +02:00
Lukas Reschke 3691523203
Bump merged JS 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 12:33:11 +02:00
Lukas Reschke 9b81763219
Bump DOMPurify to 1.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 12:29:53 +02:00
Lukas Reschke ed8a98eaa1
Prevent SQL error message in case of error 
`\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>
 2017-08-17 12:08:40 +02:00
Lukas Reschke e37cf2d6f0 Merge pull request #6158 from nextcloud/always-log-cron-execution 
Always log cron execution
 2017-08-17 11:14:12 +02:00