Commit Graph

46079 Commits

Author SHA1 Message Date
Roeland Jago Douma 1572b2661e
Merge pull request #13922 from nextcloud/backport/13644/stable14
[stable14] ignore non existing users when retrieving details of group members
2019-01-30 22:53:35 +01:00
Arthur Schiwon 37e7f3dae6
ignore non existing users when retrieving details of group members
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-30 20:06:35 +01:00
Roeland Jago Douma 3512f27bbe
Merge pull request #13928 from nextcloud/backport/13786/stable14
[stable14] Remove .css fileending from accessibility user css route
2019-01-30 20:04:34 +01:00
Julius Härtl 87fb1f411e
Remove .css fileending from accessibility user css route
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-01-30 16:50:16 +01:00
Morris Jobke bb262f5c03
Merge pull request #13923 from nextcloud/backport/13865/stable14
[stable14] fix paged search with multiple bases (LDAP)
2019-01-30 15:57:44 +01:00
Morris Jobke 257f9c4a4b
Merge pull request #13921 from nextcloud/backport/13412/stable14
[stable14] forward error message from password policy
2019-01-30 15:24:31 +01:00
Morris Jobke ecce44c050
Merge pull request #13916 from nextcloud/backport/13869/stable14
[stable14] Clean pending 2FA authentication on password reset
2019-01-30 15:06:44 +01:00
Christoph Wurst 3add3f997e
Merge pull request #13888 from nextcloud/backport/13883/stable14
[stable14] Fix dropping a folder on a folder row
2019-01-30 13:52:04 +01:00
Arthur Schiwon d77220bc7e
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-30 12:12:24 +01:00
Arthur Schiwon 0306473a59
integration test: pages search scenario with multiple bases
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-30 12:12:14 +01:00
Arthur Schiwon 1ee53d6796
typo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-30 12:11:07 +01:00
Robin Appelman 917ca1caf2 forward error message from password policy
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-30 10:57:41 +00:00
Roeland Jago Douma 931056e711
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:43:15 +01:00
Roeland Jago Douma bce6e7fc2b
Merge pull request #13901 from nextcloud/stable14-13897-fix-updating-the-password-of-a-link-share-when-passwords-are-enforced
[stable14] Fix updating the password of a link share when passwords are enforced
2019-01-30 09:53:16 +01:00
Daniel Calviño Sánchez a94fa97350 Fix template format
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-30 00:16:50 +01:00
Daniel Calviño Sánchez 355edcee74 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 popover menu
is shown only when the share is a link share, and 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-30 00:14:10 +01:00
Daniel Calviño Sánchez ab684934ea Remove unused parameter
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-30 00:08:09 +01:00
Daniel Calviño Sánchez 6fb6f3872e 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:47:46 +00:00
Morris Jobke c66f93ad58
Merge pull request #13708 from nextcloud/stb14-vcard-avatar-fixes
[stable14] vcard avatar fixes
2019-01-28 17:36:12 +01:00
Roeland Jago Douma d8b5dfe5a8
Merge pull request #13822 from nextcloud/dependabot/npm_and_yarn/build/stable14/bower-1.8.8
[Security] Bump bower from 1.8.4 to 1.8.8 in /build
2019-01-28 13:41:57 +01:00
Nextcloud bot c0c5921719
[tx-robot] updated from transifex 2019-01-26 01:12:36 +00:00
dependabot[bot] fb7d0c8435
[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:43:40 +00:00
Nextcloud bot 32cc6dd7e5
[tx-robot] updated from transifex 2019-01-25 01:12:38 +00:00
Roeland Jago Douma c7fd71ee7d
Merge pull request #13767 from nextcloud/backport/13747/stable14
[stable14] Honor remember_login_cookie_lifetime
2019-01-24 18:32:43 +01:00
Morris Jobke 081f96b420
Merge pull request #13788 from nextcloud/stable14-13217-add-acceptance-tests-for-moving-and-copying-files
[stable14] Add acceptance tests for moving and copying files
2019-01-24 14:52:32 +01:00
Daniel Calviño Sánchez 45178d935c Add acceptance tests for moving and copying selections to another folder
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-24 11:15:51 +01:00
Daniel Calviño Sánchez 1c764b22b5 Add acceptance tests for moving and copying files to another folder
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-24 11:15:51 +01:00
Morris Jobke b0c1846794
Merge pull request #13782 from nextcloud/backport/13772/stable14
[stable14] Show proper default locale
2019-01-24 11:02:35 +01:00
Morris Jobke de2c5350a9 Show proper default locale
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-24 07:33:03 +00:00
Nextcloud bot 78fadcb9b7
[tx-robot] updated from transifex 2019-01-24 01:12:25 +00:00
Roeland Jago Douma 38f01c1361
Honor remember_login_cookie_lifetime
If the remember_login_cookie_lifetime is set to 0 this means we do not
want to use remember me at all. In that case we should also not creatae
a remember me cookie and should create a proper temp token.

Further this specifies that is not 0 the remember me time should always
be larger than the session timeout. Because else the behavior is not
really defined.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-23 17:09:09 +01:00
Morris Jobke e5af104517
Merge pull request #13741 from nextcloud/backport/13140/stable14
[stable14] Cache tokens when using swift's v2 authentication
2019-01-23 15:30:12 +01:00
Morris Jobke 238655538e
Merge pull request #13763 from nextcloud/backport/13730/stable14
[stable14] Respect user locale in natural sort comparator
2019-01-23 13:33:45 +01:00
Christoph Wurst aafc32ecca Respect user locale in natural sort comparator
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-23 11:20:56 +00:00
Morris Jobke 5c6a1f70cb
Merge pull request #13745 from nextcloud/backport/13739/stable14
[stable14] cleanup shared lock if changing to exclusive lock failed
2019-01-23 08:18:37 +01:00
Nextcloud bot 9455303874
[tx-robot] updated from transifex 2019-01-23 01:12:27 +00:00
Robin Appelman 0625d2957c cleanup shared lock if changing to exclusive lock failed
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-22 15:13:40 +00:00
Roeland Jago Douma 4da5589fe2 Bump autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-22 14:37:14 +00:00
Robin Appelman a5c5a77322 Cache tokens when using swift's v2 authentication
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-22 14:37:13 +00:00
Roeland Jago Douma 417997220f
Merge pull request #13671 from nextcloud/backport/13660/stable14
[stable14] Fix template paramter
2019-01-22 11:08:17 +01:00
Roeland Jago Douma 16cca10b11
Fix template paramter
Else we get shown an error page instead of the correct 403.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-22 10:12:04 +01:00
Nextcloud bot 6bc8e1b5df
[tx-robot] updated from transifex 2019-01-22 01:12:46 +00:00
Morris Jobke 16283258ea
Update apps/dav/lib/CardDAV/PhotoCache.php
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Co-Authored-By: skjnldsv <skjnldsv@users.noreply.github.com>
2019-01-21 10:11:40 +01:00
John Molakvoæ (skjnldsv) 65e667adf2
Log failure on parsing
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-21 10:11:32 +01:00
John Molakvoæ (skjnldsv) d4652bbe8f
Allow URI as data for vcard PHOTO
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-21 10:05:28 +01:00
Nextcloud bot a5e77bc130
[tx-robot] updated from transifex 2019-01-21 01:12:11 +00:00
Nextcloud bot 4384c633ef
[tx-robot] updated from transifex 2019-01-20 01:12:50 +00:00
Nextcloud bot 22ebd26324
[tx-robot] updated from transifex 2019-01-19 01:12:40 +00:00
Morris Jobke 1dcda19614
Merge pull request #13666 from nextcloud/backport/13664/stable14
[stable14] Use warning background color & primary text color for setting warnings
2019-01-18 17:11:58 +01:00
Morris Jobke 9b4c4b4448 Use warning background color & primary text color for setting warnings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-18 12:59:35 +00:00