summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Use \OC::$CLI instead of PHP_SAPIThomas Citharel2020-06-041-1/+1
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | [tx-robot] updated from transifexNextcloud bot2020-06-051102-8610/+8284
|/ /
* | Merge pull request #21226 from nextcloud/backport/21199/stable19Roeland Jago Douma2020-06-042-5/+5
|\ \ | | | | | | [stable19] Prevent harder to share your root
| * | Prevent harder to share your rootJoas Schilling2020-06-042-5/+5
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #21200 from nextcloud/backport/21181/stable19Roeland Jago Douma2020-06-041-2/+2
|\ \ | |/ |/| [stable19] Do not only catch Exceptions but any Throwable during rmt share delete
| * Do not only catch Exceptions but any Throwable during rmt share deleteChristoph Wurst2020-06-031-2/+2
|/ | | | | | | | | | When a remote share is deleted, we notify the remove instance. This may trigger various error conditions, which we want to catch in order to avoid undeletable shares. The try-catch, however, did only capture exceptions, so things like TypeErrors were not caught and caused the process to fail hard. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #21151 from nextcloud/backport/21143/stable19Morris Jobke2020-05-2914-30/+1326
|\ | | | | [stable19] 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-0/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge pull request #21148 from nextcloud/backport/21146/stable19Roeland Jago Douma2020-05-291-3/+3
|\ | | | | [stable19] Fix reference to wrong class name
| * Fix reference to wrong class nameDaniel Calviño Sánchez2020-05-291-3/+3
|/ | | | | | | \OCP\IShare does not exist; the right name is \OCP\Share\IShare, although it is already imported as IShare. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #21135 from nextcloud/backport/21065/stable19Roeland Jago Douma2020-05-281-0/+1
|\ | | | | [stable19] Clear the statscache before fetching the metadata
| * Clear the statscache before fetching the metadataRoeland Jago Douma2020-05-281-0/+1
| | | | | | | | | | | | | | | | Else if a lot of writes happen. It might happen that an old stat result is used. Resulting in a wrong file size for the file. For example the text app when a lot of people edit at the same time. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21128 from nextcloud/backport/21123/stable19Roeland Jago Douma2020-05-281-50/+7
|\ \ | |/ |/| [stable19] simplify getGroups, fixing wrong chunking logic
| * simplify getGroups, fixing wrong chunking logicArthur Schiwon2020-05-271-50/+7
| | | | | | | | | | | | pagination is taken care of properly in the search logic in Access class Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #21126 from ↵Christoph Wurst2020-05-2820-119/+161
|\ \ | | | | | | | | | | | | nextcloud/fix/make-translation-sanitization-optional-stable19 [stable19] 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-115/+157
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #21131 from nextcloud/backport/20933/stable19Roeland Jago Douma2020-05-281-1/+1
|\ \ | |/ |/| [stable19] 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>
* Merge pull request #21114 from nextcloud/backport/21106/stable19blizzz2020-05-272-6/+29
|\ | | | | [stable19] 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>
* Merge pull request #21111 from nextcloud/backport/21108/stable19Morris Jobke2020-05-261-0/+6
|\ | | | | [stable19] fixes infinitely repeating LDPA search results with PHP <= 7.2
| * fixes infinitely repeating LDPA search results with PHP <= 7.2Arthur Schiwon2020-05-261-0/+6
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #21095 from nextcloud/backport/21090/stable19Roeland Jago Douma2020-05-262-10/+9
|\ | | | | [stable19] 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>
* | Merge pull request #21068 from nextcloud/backport/20776/stable19Morris Jobke2020-05-261-6/+20
|\ \ | | | | | | [stable19] Improve group queries
| * | Improve group queriesRoeland Jago Douma2020-05-221-6/+20
| |/ | | | | | | | | | | | | | | | | | | | | Before we'd also get the diplayname for each group in the backend. In a separate query. This is of course not ideal as this information is obtained on each and every query. Now this is queried once and properly cached. Also added more caching to the manager. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21060 from nextcloud/version/19/finalv19.0.0Roeland Jago Douma2020-05-261-2/+2
|\ \ | | | | | | 19 Final
| * | 19 FinalRoeland Jago Douma2020-05-211-2/+2
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21105 from nextcloud/backport/21092/stable19Roeland Jago Douma2020-05-265-9/+10
|\ \ | |/ |/| Update recommended apps
| * Update hub bundle and add proxy rule to htaccessJulius Härtl2020-05-255-9/+10
|/ | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Merge pull request #20964 from nextcloud/version/19/rc3v19.0.0RC3Roeland Jago Douma2020-05-201-2/+2
|\ | | | | 19 RC3
| * 19 RC3Roeland Jago Douma2020-05-141-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21028 from nextcloud/backport/20629/stable19Morris Jobke2020-05-201-1/+2
|\ \ | | | | | | [stable19] Don't load text file preview when text app is available (Fixes: #20615)
| * | Don't load text file preview when text app is available (Fixes: #20615)Jonas Meurer2020-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening a shared text document, the files_sharing app uses internal preview support in case no other app to open the text file is available. So far, it only checks for the old files_texteditor app, not for the new new text app. This commit fixes this by checking for both. Signed-off-by: Jonas Meurer <jonas@freesources.org>
* | | Merge pull request #21052 from nextcloud/backport/21050/stable19Morris Jobke2020-05-202-17/+53
|\ \ \ | | | | | | | | [stable19] Caching and compression for app store requests
| * | | Compress the appstore requests by defaultMorris Jobke2020-05-202-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | In test it reduced the transfered data from 5 MB to 2 MB. This should reduce the load on the appstore significantly. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Cache appstore requests for 60 instead of 5 minutesMorris Jobke2020-05-202-9/+9
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #21047 from nextcloud/backport/21041/stable19Roeland Jago Douma2020-05-191-0/+8
|\ \ \ | | | | | | | | [stable19] Copy over the ETag and LastModified when formatting a Dataresponse
| * | | Copy over the ETag and LastModified when formatting a DataresponseRoeland Jago Douma2020-05-191-0/+8
|/ / / | | | | | | | | | | | | | | | This way the ETag checks etc are all working. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #21029 from nextcloud/backport/21003/stable19Roeland Jago Douma2020-05-192-5/+13
|\ \ \ | | | | | | | | [stable19] Remove entries from locales.json incompatible with punic
| * | | Remove entries from locales.json incompatible with punicDaniel Kesselberg2020-05-182-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | As reported at https://github.com/nextcloud/server/issues/20999 the list contains en_US_POSIX as locale but punic is unable to parse such a locale. If you select that locale everyone is confused. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-26 11:38:50 +0000