summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-07-0824-4/+90
|
* Merge pull request #21498 from lmamane/stable17-21285-onelinerMorris Jobke2020-07-072-6/+7
|\ | | | | fix #21285 as oneliner
| * adapt testGetLoginCredentialsInvalidTokenLoginCredentials() unit test to uid ↵Lionel Elie Mamane2020-06-201-5/+6
| | | | | | | | | | | | != loginname Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
| * Return correct loginname in credentials,Lionel Elie Mamane2020-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | even when token is invalid or has no password. Returning the uid as loginname is wrong, and leads to problems when these differ. E.g. the getapppassword API was creating app token with the uid as loginname. In a scenario with external authentication (such as LDAP), these tokens were then invalidated next time their underlying password was checked, and systematically ceased to function. Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
* | [tx-robot] updated from transifexNextcloud bot2020-07-07128-120/+270
| |
* | Merge pull request #21669 from nextcloud/revert-21097-backport/21090/stable17Roeland Jago Douma2020-07-062-9/+10
|\ \ | | | | | | Revert "[stable17] Do not read certificate bundle from data dir by de…
| * | Revert "[stable17] Do not read certificate bundle from data dir by default"Roeland Jago Douma2020-07-032-9/+10
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-07-062-4/+32
| | |
* | | Merge pull request #21389 from nextcloud/backport/21380/stable17Roeland Jago Douma2020-07-042-8/+8
|\ \ \ | | | | | | | | [stable17] Increase timeout of the appstore requests
| * | | Increase timeout of the appstore requestsJoas Schilling2020-07-032-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #21587 from ↵Roeland Jago Douma2020-07-043-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport/20726/stable17-fix-federated-link-sharing-permissions [stable17] Fix federated link sharing permissions
| * | | | Fix federated link sharing permissionsDaniel Calviño Sánchez2020-06-253-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a link share has read permissions it may have too share permissions (depending on whether federated shares are allowed or not). Therefore the share permission needs to be ignored when checking the permissions to determine the public upload status. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-07-0420-18/+152
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-07-0320-24/+800
| | | |
* | | | 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>