Commit Graph

40508 Commits

Author SHA1 Message Date
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
Joas Schilling 6a130d01e7
Also for reset password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 18:02:37 +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
Joas Schilling 09747b296a
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 17:54:22 +02:00
Robin Appelman 5431b8bfc2 allow configuring the command bus 2017-08-24 16:21:50 +02:00
Robin Appelman 9731350ace split async test bus for easier subclassing 2017-08-24 16:06:37 +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
Joas Schilling 48bdb1bec1
Allow to sort groups by name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-22 14:36:00 +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
Maxence Lange 0459c03696 link to getShareByToken
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-20 15:21:58 +02: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
Lukas Reschke 2e4cd44556
Inject \OCP\IURLGenerator to make tests work
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 15:32:40 +02:00
Daniel Calviño Sánchez 4d003c812d Do not iterate over the files
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 15:18:20 +02:00
Daniel Calviño Sánchez 313b824dd7 Replace fileName variable with data.files[0].name
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 15:14:32 +02:00
Daniel Calviño Sánchez c70688e5d0 Update the whole file item instead of only its contents
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 14:26:15 +02:00
Daniel Calviño Sánchez 2860ce027a Remove "errorThrown" parameter
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 14:08:51 +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
Lukas Reschke a04feff9a7
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 12:22:44 +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