Commit Graph

47334 Commits

Author SHA1 Message Date
Roeland Jago Douma d629b5afdc
Merge pull request #14028 from nextcloud/revert-14026-backport/13954/stable15
Revert "[stable15] Show original path in trashbin"
2019-02-05 15:10:52 +01:00
Roeland Jago Douma b6e5669949
Revert "[stable15] Show original path in trashbin" 2019-02-05 15:10:32 +01:00
John Molakvoæ bfc0a5575c
Merge pull request #14026 from nextcloud/backport/13954/stable15
[stable15] Show original path in trashbin
2019-02-05 15:07:49 +01:00
Morris Jobke cba2c1fd1a Show original path in trashbin via extraData
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-05 13:09:15 +00:00
Morris Jobke 52f0633e9c
Merge pull request #13976 from nextcloud/revert-13947-TrimFilenameWinCompatibility
Revert "trim filename in webfrontend for windows compatibility"
2019-02-01 12:00:01 +01:00
Morris Jobke f46a251625
Revert "trim filename in webfrontend for windows compatibility" 2019-02-01 11:59:49 +01:00
Roeland Jago Douma 3d399a56bb
Merge pull request #13947 from HuemerGroup/TrimFilenameWinCompatibility
trim filename in webfrontend for windows compatibility
2019-02-01 10:43:45 +01:00
Christian Aigner 6637d97376 HBOX-297 trim in webfrontend for new files to stay compatible with windows 2019-01-31 15:30:20 +01:00
Morris Jobke 344c41a308
Merge pull request #13912 from nextcloud/version/noid/15.0.3RC1
15.0.3 RC 1
2019-01-31 11:08:50 +01:00
Morris Jobke 189f2fcd25
15.0.3 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-31 09:15:35 +01:00
Christoph Wurst d57afb3e54
Merge pull request #13930 from nextcloud/backport/12636/stable15
[stable15] handle mail send error gracefully
2019-01-31 08:54:46 +01:00
Christoph Wurst 13eb255277 Fix typos and unused return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-30 19:08:20 +00:00
Bjoern Schiessle 1c88b907a3 fix typo
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2019-01-30 19:08:19 +00:00
Bjoern Schiessle 0a1e776006 log full exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2019-01-30 19:08:18 +00:00
Bjoern Schiessle f22465e364 handle mail send error gracefully
log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2019-01-30 19:08:17 +00:00
Morris Jobke d34b7e594b
Merge pull request #13920 from nextcloud/backport/13891/stable15
[stable15] Remove warning in case of external storage error
2019-01-30 15:34:22 +01:00
Morris Jobke 24007e706c
Merge pull request #13918 from nextcloud/backport/13412/stable15
[stable15] forward error message from password policy
2019-01-30 15:25:06 +01:00
Morris Jobke 657621b980
Merge pull request #13906 from nextcloud/backport/13237/stable15
[stable15] Improve data directory write checking for NFS mounts
2019-01-30 14:28:43 +01:00
Morris Jobke 4e131ad796
Merge pull request #13915 from nextcloud/backport/13869/stable15
[stable15] Clean pending 2FA authentication on password reset
2019-01-30 14:25:17 +01:00
Morris Jobke dbdc5c4dd4
Merge pull request #13887 from nextcloud/backport/13883/stable15
[stable15] Fix dropping a folder on a folder row
2019-01-30 14:09:20 +01:00
Morris Jobke 1f52990013
Merge pull request #13905 from nextcloud/backport/13830/stable15
[stable15] Allow shared versions again in legacy backend
2019-01-30 12:01:42 +01:00
John Molakvoæ (skjnldsv) a1f8f67974 Remove warning in case of external storage error
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-30 10:56:38 +00:00
Robin Appelman 60126556be forward error message from password policy
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-30 10:14:55 +00:00
Roeland Jago Douma 355b0defe4
Clean pending 2FA authentication on password reset
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-30 10:41:09 +01:00
Roeland Jago Douma 75b5286169
Merge pull request #13904 from nextcloud/backport/13886/stable15
[stable15] add fallback for trashbin original location
2019-01-30 10:19:12 +01:00
Roeland Jago Douma 944defa58d
Merge pull request #13900 from nextcloud/stable15-13897-fix-updating-the-password-of-a-link-share-when-passwords-are-enforced
[stable15] Fix updating the password of a link share when passwords are enforced
2019-01-30 09:54:12 +01:00
Robert Dailey ff4dc3b66b Improve data directory write checking for NFS mounts
If `is_writable()` fails, fall back to logic that attempts to create a file
and then checks if it exists. If this check fails, an error occurs as it
did before.

Discussion on this solution was found here:
https://help.nextcloud.com/t/write-errors-for-nfs-mount/23328

Fixes #7124

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
2019-01-30 08:39:45 +00:00
Roeland Jago Douma ae826f5a2f
Merge pull request #13884 from nextcloud/backport/13865/stable15
[stable15] fix paged search with multiple bases (LDAP)
2019-01-30 09:31:13 +01:00
Roeland Jago Douma a36577463d Allow shared versions again in legacy backend
To make sure that the versions in the legacy backend are shared again we
have to check the storage of a file. Since all shared files are still on
the owners storage.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-30 08:23:50 +00:00
Roeland Jago Douma 3a34132b06
Merge pull request #13804 from nextcloud/backport/13802/stable15
[stable15] Fix long comment in dark theme
2019-01-30 09:08:48 +01:00
Robin Appelman a6f6a3aa5d add fallback for trashbin original location
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-30 08:04:49 +00:00
Daniel Calviño Sánchez 9a1d8eb0e5 Fix updating the password of a link share when passwords are enforced
The password input was shown in the popup menu when passwords were not
enforced, or when they were enforced but no password was set, which
prevented updating/changing the password once set. As the password input
should be shown too when password are enforced and a password is set no
condition is needed, so now the password input is always shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-29 23:37:54 +01:00
Daniel Calviño Sánchez 4321e0fc6d Fix dropping a folder on a folder row
When the uploaded files have a relative path (that is, when a folder is
uploaded) it is first ensured that all the parent folders exist, which
is done by trying to create them. When a folder is created in the
currently opened folder the file list is updated and a row for the new
folder is added. However, this was done too when the folder already
existed, which caused the previous row to be removed and a new one added
to replace it.

For security reasons, some special headers need to be set in requests;
this is done automatically for jQuery by handling the "ajaxSend" event
in the document. In the case of DAV requests, if the headers are not set
the server rejects the request with "CSRF check not passed".

When a file or folder is dropped on a folder row the jQuery upload
events are chained from the initial drop event, which has the row as its
target. In order to upload the file jQuery performs a request, which
triggers the "ajaxSend" event in the row; this event then bubbles up to
the document, which is then handled by adding the special headers to the
request.

However, when a folder was dropped on a folder row that folder row was
removed when ensuring that the folder exists. The jQuery upload events
were still triggered on the row, but as it had been removed it had no
parent nodes, and thus the events did not bubble up. Due to this the
"ajaxSend" event never reached the document when triggered on the
removed row, the headers were not set, and the upload failed.

All this is simply fixed by not removing the folder row when trying to
create it if it existed already.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-29 14:46:07 +00:00
Roeland Jago Douma 95f4c21573
Merge pull request #13882 from nextcloud/backport/13866/stable15
[stable15] always use multipart uploader for s3 uploads
2019-01-29 15:17:34 +01:00
Arthur Schiwon 2b8a669d31 iterate over bases instead of doing parallel search
parallel search is not compatible with paged search, but the letter is
usually always applied.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-29 13:25:23 +00:00
Arthur Schiwon 3494f2794d integration test: pages search scenario with multiple bases
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-29 13:25:22 +00:00
Arthur Schiwon fe1500ff36 typo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-29 13:25:20 +00:00
Robin Appelman ff5f28a65e always use multipart uploader for s3 uploads
the multipart uploader handles non seekable streams while `upload` does not

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-29 10:17:07 +00:00
Roeland Jago Douma 779fd2ea9c
Merge pull request #13821 from nextcloud/dependabot/npm_and_yarn/build/stable15/bower-1.8.8
[Security] Bump bower from 1.8.4 to 1.8.8 in /build
2019-01-28 13:42:16 +01:00
Morris Jobke 5820039160
Merge pull request #13852 from nextcloud/backport/13801/stable15
[stable15] Fix for high contrast theme
2019-01-28 11:13:09 +01:00
Jan-Christoph Borchardt 3f08f0066c Fix settings section divider being very visible below navigation bar
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-01-27 17:56:15 +00:00
Jan-Christoph Borchardt 8fa8f51ed5 Accessibility: Fix header icon opacity with high contrast theme
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-01-27 17:56:15 +00:00
Nextcloud bot fc0480282a
[tx-robot] updated from transifex 2019-01-26 01:12:28 +00:00
dependabot[bot] bf02927c7b
[Security] Bump bower from 1.8.4 to 1.8.8 in /build
Bumps [bower](https://github.com/bower/bower) from 1.8.4 to 1.8.8. **This update includes security fixes.**
- [Release notes](https://github.com/bower/bower/releases)
- [Changelog](https://github.com/bower/bower/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bower/bower/compare/v1.8.4...v1.8.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-25 11:40:45 +00:00
Nextcloud bot e4ea4061f6
[tx-robot] updated from transifex 2019-01-25 01:12:30 +00:00
Joas Schilling 87b7dd0af2 Merge the str_replacements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-24 20:37:18 +00:00
Joas Schilling 63a1ef9154 Fix linear-gradient for long comments on dark-theme
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-24 20:37:17 +00:00
Morris Jobke d823f6fba8
Merge pull request #13792 from nextcloud/backport/13644/stable15
[stable15] ignore non existing users when retrieving details of group members
2019-01-24 19:17:22 +01:00
Morris Jobke 07ded47c22
Merge pull request #13794 from nextcloud/backport/13742/stable15
[stable15] Add icon to restore activity
2019-01-24 19:17:01 +01:00
Morris Jobke 61c2919225
Merge pull request #13793 from nextcloud/backport/13786/stable15
[stable15] Remove .css fileending from accessibility user css route
2019-01-24 19:16:07 +01:00