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

Fixes #106 - adds Google Authenticator support #2842

Merged
merged 13 commits into from
Oct 29, 2016
Merged

Conversation

snipe
Copy link
Owner

@snipe snipe commented Oct 29, 2016

There are three options:

  • two-factor disabled
  • two-factor optional (the user can choose to enable if if they want)
  • two-factor required (superadmins can force all logins to use two-factor)

@snipe snipe merged commit cea2559 into develop Oct 29, 2016
@snipe snipe removed the in progress label Oct 29, 2016
@snipe snipe deleted the features/google2fa branch October 29, 2016 12:51
dmeltzer pushed a commit to dmeltzer/snipe-it that referenced this pull request Nov 5, 2016
* refactor to clean up LDAP login, and make the login method easier to handle.

* Login refactor cleanup

* Google 2FA package

* Adds Google Authenticator two-factor

* Removed unused blade

* Added optin setting in profile

* Removed dumb comments

* Made lock_passwords check more consistent

* Additional two factor strings

* Lock passwords check

* Display feature disabled text if in demo mode

* Two factor admin reset options

* Translation strings
dmeltzer pushed a commit to dmeltzer/snipe-it that referenced this pull request Nov 6, 2016
* refactor to clean up LDAP login, and make the login method easier to handle.

* Login refactor cleanup

* Google 2FA package

* Adds Google Authenticator two-factor

* Removed unused blade

* Added optin setting in profile

* Removed dumb comments

* Made lock_passwords check more consistent

* Additional two factor strings

* Lock passwords check

* Display feature disabled text if in demo mode

* Two factor admin reset options

* Translation strings
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.

2 participants