Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resend activation email for new users as admin #9966

Merged
merged 1 commit into from
Jun 26, 2018

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Jun 22, 2018

Fix #6023

@nextcloud/designers @jonasgarstick

@codecov
Copy link

codecov bot commented Jun 22, 2018

Codecov Report

Merging #9966 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##             master   #9966   +/-   ##
========================================
  Coverage      31.7%   31.7%           
  Complexity    26017   26017           
========================================
  Files          1660    1660           
  Lines         96167   96167           
  Branches       1290    1290           
========================================
  Hits          30490   30490           
  Misses        65677   65677

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke
Copy link
Member

Rebase to fix the conflicts ;)

@skjnldsv skjnldsv force-pushed the resend-welcome-email branch 2 times, most recently from 976177f to 9c7b969 Compare June 25, 2018 16:36
@JK74
Copy link

JK74 commented Jun 25, 2018

Gents, great to hear!

what about extending the timeout for activation from 24h to 48 or 96 or longer?

@skjnldsv
Copy link
Member Author

@JK74 it's not the same issue though. Could you check if there is not already an issue on this?

@JK74
Copy link

JK74 commented Jun 25, 2018

Yes will do but it's an alternative solution as I think most people like to see the resolution in 2 ways: manual re-submission and extensing the activation time

@skjnldsv skjnldsv force-pushed the resend-welcome-email branch from 9c7b969 to 3df49b7 Compare June 26, 2018 07:02
@skjnldsv
Copy link
Member Author

skjnldsv commented Jun 26, 2018

Rebased.
Please review

@@ -40,7 +40,11 @@ var n="undefined"!=typeof window&&"undefined"!=typeof document,r=["Edge","Triden
* vue-router v3.0.1
* (c) 2017 Evan You
* @license MIT
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't look right

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed 🙈

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the resend-welcome-email branch from 3df49b7 to d3d357f Compare June 26, 2018 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants