summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #21552 from nextcloud/backport/21535/stable17Roeland Jago Douma2020-07-023-39/+62
|\ \ \ \ | | | | | | | | | | [stable17] Fix language in share notes email for users
| * | | | Fix language in share notes email for usersJoas Schilling2020-06-243-39/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #21656 from nextcloud/backport/21653/stable17Roeland Jago Douma2020-07-022-0/+34
|\ \ \ \ \ | | | | | | | | | | | | [stable17] Fix IPv6 remote addresses from X_FORWARDED_FOR headers before validating
| * | | | | Fix IPv6 remote addresses from X_FORWARDED_FOR headers before validatingJoas Schilling2020-07-022-0/+34
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-07-014-0/+58
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-06-3014-96/+110
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-06-292-2/+2
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-06-284-0/+6
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-06-2716-0/+32
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-06-254-0/+8
| | | |
* | | | Merge pull request #21570 from nextcloud/backport/21564/stable17blizzz2020-06-241-1/+1
|\ \ \ \ | | | | | | | | | | [stable17] fix obsolete usage of OCdialogs
| * | | | fix obsolete usage of OCdialogsArthur Schiwon2020-06-241-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / / / [tx-robot] updated from transifexNextcloud bot2020-06-24142-420/+430
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2020-06-236-6/+6
| | |
* | | Merge pull request #21523 from nextcloud/backport/21478/stable17Roeland Jago Douma2020-06-221-2/+2
|\ \ \ | | | | | | | | [stable17] Clarify that the email is always shared within the instance
| * | | Clarify that the email is always shared within the instanceJoas Schilling2020-06-221-2/+2
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-06-212-0/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-2016-2/+318
| | |
* | | Merge pull request #21487 from nextcloud/backport/21482/stable17blizzz2020-06-191-1/+5
|\ \ \ | | | | | | | | [stable17] Don't log Keys
| * | | Don't log KeysJoas Schilling2020-06-191-1/+5
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-06-1916-28/+296
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-1814-32/+58
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-174-2/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-1612-8/+18
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-1514-38/+44
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-06-142-2/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2020-06-1118-18/+66
| |
* | [tx-robot] updated from transifexNextcloud bot2020-06-10144-402/+550
| |
* | Merge pull request #21335 from nextcloud/backport/21318/stable17Roeland Jago Douma2020-06-091-0/+1
|\ \ | | | | | | [stable17] clear LDAP cache after user deletion
| * | clear LDAP cache after user deletionArthur Schiwon2020-06-091-0/+1
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2020-06-0926-110/+144
| |
* | Merge pull request #21158 from ↵Joas Schilling2020-06-0817-44/+1369
|\ \ | | | | | | | | | | | | nextcloud/backport/21143/stable17-fix-password-changes-in-link-and-mail-shares [stable17] Fix password changes in link and mail shares
| * | Do not disable send password by Talk without setting new password in UIDaniel Calviño Sánchez2020-06-013-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before it was possible to disable "send password by Talk" without setting a new password, so the UI allowed that. Now that the server prevents it the UI had to be adjusted to not update the share until a new password is set when "send password by Talk" is disabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add integration tests for video verificationDaniel Calviño Sánchez2020-06-014-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-06-014-0/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-012-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-06-012-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-06-012-9/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-012-5/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-012-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-06-013-4/+109
| | | | | | | | | | | | | | | | | | | | | | | | When a mail share was created with a password the given password was ignored. Now the given password is properly set and, if passwords are enforced, it is not overriden with the autogenerated password. 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-06-08134-764/+804
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2020-06-0720-28/+118
| |
* | Merge pull request #20803 from nextcloud/backport/19124/stable17Roeland Jago Douma2020-06-061-73/+77
|\ \ | | | | | | [stable17] Exclude groups from sharing: Skip delete groups
| * | Ignore delete groupsDaniel Kesselberg2020-05-041-73/+77
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #21130 from nextcloud/backport/21123/stable17Roeland Jago Douma2020-06-061-50/+7
|\ \ \ | | | | | | | | [stable17] simplify getGroups, fixing wrong chunking logic
| * | | simplify getGroups, fixing wrong chunking logicArthur Schiwon2020-05-281-50/+7
| | | | | | | | | | | | | | | | | | | | | | | | pagination is taken care of properly in the search logic in Access class Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2020-06-0634-2/+72
| | | |
* | | | Merge pull request #21249 from nextcloud/backport/21229/stable17Roeland Jago Douma2020-06-051-2/+4
|\ \ \ \ | | | | | | | | | | [stable17] Fix empty event UUID reminder notifications