summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-10-02186-1436/+252
|
* Merge pull request #23139 from nextcloud/fix/18/settings_ignore_jsRoeland Jago Douma2020-10-021-12/+1
|\ | | | | [stable18] Fix ignoring the correct settings files for translations
| * [stable18] Fix ignoring the correct settings files for translationsRoeland Jago Douma2020-10-021-12/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #23076 from nextcloud/version/18.0.10/RC1v18.0.10RC1Roeland Jago Douma2020-10-011-2/+2
|\ | | | | 18.0.10 RC1
| * 18.0.10 RC1Roeland Jago Douma2020-09-281-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22443 from nextcloud/backport/22421/stable18Roeland Jago Douma2020-10-014-29/+61
|\ \ | | | | | | [stable18] show better quota warning for group folders and external storage
| * | fix testsRobin Appelman2020-09-291-14/+21
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | show better quota warning for group folders and external storageRobin Appelman2020-09-293-15/+40
| | | | | | | | | | | | | | | | | | instead of showing the generic 'Your storage is full' message, better explain that it's the group folder/external storage that is full Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #23088 from nextcloud/backport/23013/stable18Roeland Jago Douma2020-10-011-2/+3
|\ \ \ | | | | | | | | [stable18] Show federation and email results also with exact user match unless c…
| * | | Show federation and email results also with exact user match unless containing @Joas Schilling2020-10-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before when you have a user "smith" and a federated user "smith@example.com" you could see the federation result with "smit" but not with "smith" anymore. With most LDAP configurations and local backend setups this is disturbing and causes issues. The idea of not showing the email and federation on a matching user was with: Local user registered with "smith@example.com" user id and having that same email / cloud id in your contacts addressbook. So we now only hide those "side results" when the search does contain an @ Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #22942 from nextcloud/backport/22395/stable18Roeland Jago Douma2020-10-0122-29/+30
|\ \ \ \ | | | | | | | | | | [stable18] Fix settings chunk loading
| * | | | Fix settings chunk loadingJohn Molakvoæ (skjnldsv)2020-09-1822-29/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #22989 from nextcloud/backport/22533/stable18Roeland Jago Douma2020-10-013-10/+6
|\ \ \ \ \ | | | | | | | | | | | | [stable18] Flow: do not hide "matches" and "does not match" checkers
| * | | | | do not hide "matches" and "does not match" checkersArthur Schiwon2020-09-293-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they show up previously with / typed – end user needs to know about it - inconsistent with some other fields, that show it directly Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #22927 from nextcloud/backport/22915/stable18Roeland Jago Douma2020-10-011-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable18] improve handling of out of space errors for smb
| * | | | | | improve handling of out of space errors for smbRobin Appelman2020-09-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #22802 from nextcloud/backport/stable18/22116-22648-22761Roeland Jago Douma2020-10-016-5/+391
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable18] Fix share transfer of single files and on the transfered node
| * | | | | | | Add integration tests to check that only the given path is transferredDaniel Calviño Sánchez2020-09-181-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until recently (it was fixed in ac2999a26a) when a path was transferred other shares with the target user were removed, so a test was added to ensure that it does not happen again. Besides that a test to ensure that other files with the target user are not transferred was added too (it did not fail before, but seemed convenient to have that covered too :-) ). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add integration tests for transferring files of a user with a risky nameDaniel Calviño Sánchez2020-09-183-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files:transfer-ownership performs a sanitization of users with "risky" display names (including characters like "\" or "/"). In order to allow (escaped) double quotes in the display name the regular expression used in the "user XXX with displayname YYY exists" step is not the "standard" one, "([^"]*)". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add integration test for transferring the path of a single fileDaniel Calviño Sánchez2020-09-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add integration tests for transferring ownership of resharesDaniel Calviño Sánchez2020-09-171-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only transferring ownership of a reshare with a group to a user in the group is possible. When transferring ownership of a reshare with another user or with a group to a user not in the group restoring the share fails (but the command succeeds, it only fails for the specific files that are reshares). When transferring ownership of a path that is a reshare the command fails (as when a specific path is provided the path tries to move the file, it does not take into account reshares). The added integration tests reflect the above behaviours. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Check share ownership after transferring file ownershipDaniel Calviño Sánchez2020-09-171-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The integration tests did not verify that the shares were actually transferred between the users (or that they were removed due to being transferred to the sharee). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Check whether file exists or not after transferring ownershipDaniel Calviño Sánchez2020-09-171-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The integration tests did not verify that the files were actually transferred between the users, only that the files were downloadable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Transfer shares if no path providedJulius Härtl2020-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Transfer shares of the transferred root nodeJulius Härtl2020-09-173-3/+49
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-10-018-2/+8
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-302-0/+2
| | | | | | |
* | | | | | | Merge pull request #23091 from nextcloud/backport/23074/stable18Roeland Jago Douma2020-09-291-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [stable18] Do not match sharees on an empty email address
| * | | | | | Do not match sharees on an empty email addressChristoph Wurst2020-09-291-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When asking for sharees we compare not only UID and displayname but also the email address. And if that matches we return the sharee as an exact match. This logic had a flaw as in that it also matched the empty string to users with no email address. This is most noticeable when you disable sharee enumeration and open the ownership transfer dialog. It suggested other users of the instance before. This has stopped now. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #22743 from nextcloud/backport/22589/stable18Joas Schilling2020-09-292-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable18] Allow additional personal settings via normal registration
| * | | | | | Fix unit testsJoas Schilling2020-09-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Allow additional personal settings via normal registrationJoas Schilling2020-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #23003 from nextcloud/backport/22940/stable18Roeland Jago Douma2020-09-293-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [stable18] Never copy the share link when the password is forced
| * | | | | | Never copy the share link when the password is forcedJoas Schilling2020-09-283-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2912-0/+38
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-282-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-278-10/+20
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2616-2/+18
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-25136-266/+364
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2416-8/+70
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2310-10/+32
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2210-20/+20
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2110-8/+12
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-2026-8/+44
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-18184-128/+304
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-09-18166-378/+478
| |/ / |/| |
* | | Merge pull request #22900 from nextcloud/backport/21894/stable18Morris Jobke2020-09-171-2/+2
|\ \ \ | | | | | | | | [stable18] fix: file quota was not applied in all cases
| * | | fix: file quota was not applied in all caseskorelstar2020-09-171-2/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2020-09-1786-92/+112
| | |
* | | Merge pull request #22894 from nextcloud/backport/22880/stable18Morris Jobke2020-09-161-17/+18
|\ \ \ | | | | | | | | [stable18] Revoke secsignid