summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-06-0316-4/+68
|
* [tx-robot] updated from transifexNextcloud bot2020-06-0210-20/+62
|
* [tx-robot] updated from transifexNextcloud bot2020-06-0126-196/+550
|
* [tx-robot] updated from transifexNextcloud bot2020-05-314-10/+60
|
* [tx-robot] updated from transifexNextcloud bot2020-05-30142-972/+1242
|
* Merge pull request #21159 from nextcloud/revert-21152-backport/21143/stable18Morris Jobke2020-05-2914-1328/+31
|\ | | | | Revert "[stable18] Fix password changes in link and mail shares"
| * Revert "[stable18] Fix password changes in link and mail shares"Morris Jobke2020-05-2914-1328/+31
|/
* Merge pull request #21152 from nextcloud/backport/21143/stable18Morris Jobke2020-05-2914-31/+1328
|\ | | | | [stable18] Fix password changes in link and mail shares
| * Add integration tests for video verificationDaniel Calviño Sánchez2020-05-294-0/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling the "send password by Talk" property of shares require that Talk is installed and enabled, so the Drone step that runs them has to first clone the Talk repository. When the integration tests are run on a local development instance, however, it is not guaranteed that Talk is installed. Due to this the "@Talk" tag was added, which ensures that any feature or scenario marked with it will first check if Talk is installed and, if not, skip the scenario (instead of failing). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add integration tests for creating and updating a mail shareDaniel Calviño Sánchez2020-05-295-1/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when a mail share is created or updated an e-mail is sent to the sharee, which is done by connecting to the SMTP server set in the configuration. If the server can not be contacted then the creation or update of the mail share fails. To make possible to test mail shares without using a real SMTP server a fake one has been added. The original script, which is MIT licensed, was based on inetd, so it was slightly modified to run on its own. In order to use it from the integration tests the "Given dummy mail server is listening" step has to be called in the scenarios in which the mail server is needed. For now that is the only available step; things like checking the sent mails, while possible (as the script can log the mails to certain file), have not been added yet. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Generalize integration test steps to download last shareDaniel Calviño Sánchez2020-05-292-4/+18
| | | | | | | | | | | | | | Note that the "last link share can be downloaded" step was kept as it tests the "url" property specific of link shares. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Remove unused variablesDaniel Calviño Sánchez2020-05-292-10/+7
| | | | | | | | | | | | The step names were adjusted accordingly. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Fix disabling send password by Talk without new password in mail sharesDaniel Calviño Sánchez2020-05-292-9/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When "send password by Talk" was disabled in a mail share it was possible to keep the same password as before, as it does not pose any security issue (unlike keeping it when "send password by Talk" is enabled, as in that case the password was already disclosed by mail). However, if a mail share is updated but the password is not set again only the hashed password will be available. In that case it would not make sense to send the password by mail, so now the password must be changed when disabling "send password by Talk". Note that, even if explicitly setting the same password again along with the "send password by Talk" property would work, this was also prevented for simplicity. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Fix enabling send password by Talk with same password in mail sharesDaniel Calviño Sánchez2020-05-292-5/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | When "send password by Talk" is enabled in a mail share a new password must be also set. However, when the passwords of the original and the new share were compared it was not taken into account that the original password is now hashed, while the new one is not (unless no new password was sent, in which case the password of the original share was set in the new share by the controller, but that was already prevented due to both passwords being literally the same), so it was possible to set the same password again. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Fix enabling send password by Talk with empty password in link sharesDaniel Calviño Sánchez2020-05-292-0/+75
| | | | | | | | | | | | | | When "send password by Talk" is enabled in a link share now a non empty password is enforced. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Fix creating a mail share with a passwordDaniel Calviño Sánchez2020-05-292-4/+104
| | | | | | | | | | | | | | | | | | | | When a mail share was created with a password the given password was not hashed, so it was not possible to open the share with that password. Moreover, if passwords were enforced the given password was ignored and a new one was set (although in this case it was hashed so it worked as expected). Now the given password is properly hashed and not overriden. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Extend mail shares unit tests to check the password and mail templateDaniel Calviño Sánchez2020-05-291-2/+23
|/ | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2020-05-2914-26/+98
|
* Merge pull request #21061 from nextcloud/version/18.0.5/RC1v17.0.5RC1Roeland Jago Douma2020-05-281-2/+2
|\ | | | | 18.0.5 RC1
| * 18.0.5 RC1Roeland Jago Douma2020-05-211-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21109 from nextcloud/backport/19793/stable18Roeland Jago Douma2020-05-289-43/+45
|\ \ | | | | | | [stable18] Fix resharing of federated shares that were created out of links
| * | Fix federated link sharing permissionsJohn Molakvoæ (skjnldsv)2020-05-263-7/+16
| | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | Fix share update testJulius Härtl2020-05-261-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Update public link share permission codeRoeland Jago Douma2020-05-261-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Have share permissions on link shares if it is enabledRoeland Jago Douma2020-05-261-1/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Adjust integration tests to new permissionsJulius Härtl2020-05-261-3/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Remove unneeded test since links have resharing permissions by defaultJulius Härtl2020-05-261-18/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Link shares have reshare permission if outgoing federated shares are enabledJulius Härtl2020-05-263-12/+13
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Set proper share type when converting link shares to federated sharesJulius Härtl2020-05-261-0/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #21127 from ↵Christoph Wurst2020-05-2820-100/+225
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/make-translation-sanitization-optional-stable18 [stable18] Make the translation sanitization optional
| * | | Fix devices & sessions sanitizationChristoph Wurst2020-05-273-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Make the translation sanitization optionalChristoph Wurst2020-05-2717-96/+221
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #21132 from nextcloud/backport/20933/stable18Roeland Jago Douma2020-05-281-1/+1
|\ \ \ \ | | | | | | | | | | [stable18] Move the password confirmation form template to post
| * | | | Move the password confirmation form template to postRoeland Jago Douma2020-05-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | I know we use JS for this. But it triggers some false positives on testing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / [tx-robot] updated from transifexNextcloud bot2020-05-2814-18/+276
|/ / /
* | | Merge pull request #21115 from nextcloud/backport/21106/stable18blizzz2020-05-272-6/+29
|\ \ \ | | | | | | | | [stable18] use the loginname to verify the old password in user password changes
| * | | use the loginname to verify the old password in user password changesArthur Schiwon2020-05-262-6/+29
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-2732-6/+298
|/ / /
* | | Merge pull request #21096 from nextcloud/backport/21090/stable18Roeland Jago Douma2020-05-262-10/+9
|\ \ \ | |/ / |/| | [stable18] Do not read certificate bundle from data dir by default
| * | Do not read certificate bundle from data dir by defaultMorris Jobke2020-05-252-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the resources/config/ca-bundle.crt was only used when the list of custom certificates was empty and the instance was not installed. But it should also be used when the list is empty and the instance is installed. This is inverting the logic to stop if the instance is not installed to use the default bundle. And it also does this when the list is empty. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2020-05-2660-50/+84
| | |
* | | Merge pull request #20881 from nextcloud/backport/20841/stable18Morris Jobke2020-05-252-21/+81
|\ \ \ | |/ / |/| | [stable18] add locking to resolve concurent move to trashbin conflicts
| * | add locking to resolve concurent move to trashbin conflictsRobin Appelman2020-05-082-21/+81
| | | | | | | | | | | | | | | | | | | | | uses a lock to prevent two requests from moving a file to the trashbin concurrently (causing sql duplicate key errors) Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #20965 from nextcloud/backport/20033/stable18Morris Jobke2020-05-256-23/+236
|\ \ \ | | | | | | | | [stable18] Enable fseek for files in S3 storage
| * | | harden seekable http stream a bit against failuresRobin Appelman2020-05-221-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | update autoloaderRobin Appelman2020-05-203-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | add basic tests for s3 seeking and add some error handling if reopen return ↵Robin Appelman2020-05-203-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | the wrong range Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | make seekable s3 stream genericRobin Appelman2020-05-202-57/+106
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Enable fseek for files in S3 storageLukas Stabe2020-05-202-19/+147
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Stabe <lukas@stabe.de>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-2512-4/+44
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 13:51:41 +0000