Skip to content

[Upstream Catchup] Merge RC:master to develop_pwa#411

Merged
ear-dev merged 20 commits intodevelop_pwafrom
develop_pwa-catchup-7301fc4
Sep 21, 2020
Merged

[Upstream Catchup] Merge RC:master to develop_pwa#411
ear-dev merged 20 commits intodevelop_pwafrom
develop_pwa-catchup-7301fc4

Conversation

@github-actions
Copy link
Copy Markdown

Weekly Catchup PR to merge RC:master in develop_pwa.

renatobecker and others added 18 commits September 11, 2020 10:12
* Remember users' 2FA right after registration

* Change register server to false by default
…PI (RocketChat#18864)

* test: add e2e tests for REST API user deactivation

* fix(app): read confirmRelinquish from HTTP request

* chore(app): remove unnecessary console.log
@Shailesh351 Shailesh351 self-assigned this Sep 21, 2020
@Shailesh351 Shailesh351 marked this pull request as ready for review September 21, 2020 05:48
@ear-dev
Copy link
Copy Markdown

ear-dev commented Sep 21, 2020

@Shailesh351 have you been able to test this at all, maybe something quick? Let us know how it looks... Thanks

@Shailesh351
Copy link
Copy Markdown

@ear-dev Yeah, I have tested locally it is working fine 👍

Copy link
Copy Markdown

@ear-dev ear-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@ear-dev ear-dev merged commit 7abe3f3 into develop_pwa Sep 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants