summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-05-30142-970/+1240
|
* Merge pull request #21154 from nextcloud/fix/file_info_load_orderMorris Jobke2020-05-291-2/+2
|\ | | | | Fix the loading order of the js files_info and files_client
| * Fix the loading order of the js files_info and files_clientRoeland Jago Douma2020-05-291-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21156 from ↵Morris Jobke2020-05-291-1/+1
|\ \ | | | | | | | | | | | | nextcloud/do-not-clone-the-whole-talk-repository-for-integration-tests Do not clone the whole Talk repository for integration tests
| * | Do not clone the whole Talk repository for integration testsDaniel Calviño Sánchez2020-05-291-1/+1
|/ / | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #21141 from nextcloud/fix/require-ext-pdo-composerRoeland Jago Douma2020-05-292-3/+5
|\ \ | |/ |/| List ext-pdo as hard requirement for composer
| * List ext-pdo as hard requirement for composerChristoph Wurst2020-05-282-3/+5
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20970 from nextcloud/td/js/escape-html-globalRoeland Jago Douma2020-05-2929-105/+121
|\ \ | | | | | | Remove the escape-html global
| * | Remove the escape-html globalRoeland Jago Douma2020-05-2929-105/+121
| | | | | | | | | | | | | | | | | | | | | Already announced for 19 that it would go. So now it realy does go. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #21143 from ↵Roeland Jago Douma2020-05-2914-30/+1326
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix-password-changes-in-link-and-mail-shares 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-282-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-282-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-282-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-281-2/+23
| |/ | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #21118 from nextcloud/td/move_systemtagsRoeland Jago Douma2020-05-2917-140/+22
|\ \ | | | | | | Move systemtags to a proper location
| * | Move the systemtags to core/srcRoeland Jago Douma2020-05-2817-140/+22
| |/ | | | | | | | | | | | | * Move to the handlebar loader from webpack Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #21146 from nextcloud/fix-reference-to-wrong-class-nameRoeland Jago Douma2020-05-291-3/+3
|\ \ | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2020-05-2914-26/+98
| |
* | Merge pull request #21140 from ↵Morris Jobke2020-05-281-1/+1
|\ \ | |/ |/| | | | | nextcloud/enhancement/oc-get-all-apps-return-type-doc Document \OC_App::getAllApps return type
| * Document \OC_App::getAllApps return typeChristoph Wurst2020-05-281-1/+1
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20597 from nextcloud/enh/lazy_node_eventsRoeland Jago Douma2020-05-2821-63/+753
|\ | | | | Add lazy events for the Node API
| * Add lazy events for the Node APIRoeland Jago Douma2020-05-2821-63/+753
| | | | | | | | | | | | | | | | | | | | | | Right now if you want to get events via the Node API you have to have a real instance of the Root. Which in turns sets up the whole FS. We should make sure this is done lazy. Else enabling the preview generator for example makes you setup the whole FS on each and every authenticated call. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21124 from ↵Roeland Jago Douma2020-05-284-0/+40
|\ \ | |/ |/| | | | | nextcloud/feature/20612/add-capability-for-file-comments Add a capability when file comments are enabled
| * Add a capability when file comments are enabledJoas Schilling2020-05-284-0/+40
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2020-05-2814-18/+276
| |
* | Merge pull request #21122 from ↵Roeland Jago Douma2020-05-274-17/+24
|\ \ | | | | | | | | | | | | nextcloud/enhancement/auth-token-exception-reporting Improve traces of invalid token exceptions
| * | Log why a token is not valid during password checkChristoph Wurst2020-05-271-0/+4
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Improve traces of invalid token exceptionsChristoph Wurst2020-05-273-17/+20
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #21123 from nextcloud/fix/noid/fix-retrieval-of-groupsRoeland Jago Douma2020-05-271-50/+7
|\ \ \ | | | | | | | | 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 #21112 from nextcloud/techdebt/noid/remove-db-prefixJoas Schilling2020-05-273-9/+2
|\ \ \ | | | | | | | | Remove db prefix option from cli install command
| * | | Remove the prefix setting attempt from our CIJoas Schilling2020-05-262-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Remove db prefix option from cli install commandJoas Schilling2020-05-261-7/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #20976 from ↵Christoph Wurst2020-05-2720-143/+145
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/fix/make-translation-sanitization-optional 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-139/+141
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #21079 from nextcloud/dependabot/npm_and_yarn/moment-2.26.0Roeland Jago Douma2020-05-2710-48/+48
|\ \ \ | | | | | | | | Bump moment from 2.25.3 to 2.26.0
| * | | Bump moment from 2.25.3 to 2.26.0dependabot-preview[bot]2020-05-2610-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [moment](https://github.com/moment/moment) from 2.25.3 to 2.26.0. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.25.3...2.26.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #21117 from nextcloud/design/text-variables-simplifyMorris Jobke2020-05-272-4/+4
|\ \ \ \ | |_|_|/ |/| | | Simplify text variables from 4 to 2, map -lighter to -maxcontrast
| * | | Simplify text variables from 4 to 2, map -lighter to -maxcontrastJan-Christoph Borchardt2020-05-262-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-2732-6/+298
|/ / /
* | | Merge pull request #21106 from nextcloud/fix/10809/user-pwd-change-loginnameRoeland Jago Douma2020-05-262-6/+29
|\ \ \ | |_|/ |/| | 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 #21108 from nextcloud/fix/20745/eor-old-php-apiRoeland Jago Douma2020-05-261-0/+6
|\ \ | | | | | | fixes infinitely repeating LDPA search results with PHP <= 7.2