Code

Fetch upstream#5

Code

Open

benjaminwols wants to merge 80 commits intobenjaminwols:masterbenjaminwols/two_factor_authentication:masterfrom Houdini:masterHoudini/two_factor_authentication:masterCopy head branch name to clipboard

+336-120

Commits

Commits on Aug 26, 2016

• Bump version 1.1.5 -> 2.0.0

  Show description for 56f099d
  sbc100

  committed
  56f099d

  Copy full SHA for 56f099d

Commits on Nov 8, 2016

• Add compat with older versions of devise

  gaurish

  committed
  ffbad70

  Copy full SHA for ffbad70

Commits on Nov 12, 2016

• [PR Feedback] Use Devise::Version over respond_to?

  gaurish

  committed
  348c2a1

  Copy full SHA for 348c2a1

Commits on Nov 14, 2016

• Merge pull request #107 from gaurish/master

  Show description for 0f40c79
  Houdini

  authored
  0f40c79

  Copy full SHA for 0f40c79

Commits on Dec 1, 2016

• Fix merge conflict

  

  Benjamin Wols

  committed
  41a01ac

  Copy full SHA for 41a01ac

• Add test for deleting cookie on logout

  

  Benjamin Wols

  committed
  4cc5762

  Copy full SHA for 4cc5762

• Update readme

  

  Benjamin Wols

  committed
  a97b3f6

  Copy full SHA for a97b3f6

• Access config via Devise instead user.class

  

  Benjamin Wols

  committed
  d1e1a66

  Copy full SHA for d1e1a66

Commits on Dec 2, 2016

• Merge pull request #95 from sbc100/bump_version

  Show description for d0d42e5
  Houdini

  authored
  d0d42e5

  Copy full SHA for d0d42e5

Commits on Feb 24, 2017

• README typo fix[ci skip]

  shaunakpp

  committed
  d87b7b3

  Copy full SHA for d87b7b3

Commits on Feb 27, 2017

• Merge pull request #110 from shaunakpp/docs

  Show description for 7d99a6c
  Houdini

  authored
  7d99a6c

  Copy full SHA for 7d99a6c

Commits on Mar 1, 2017

• Update two_factor_authenticatable.rb

  apoyan

  authored
  a32f71a

  Copy full SHA for a32f71a

Commits on Mar 6, 2017

• Merge pull request #111 from apoyan/master

  Show description for 40fb11b
  Houdini

  authored
  40fb11b

  Copy full SHA for 40fb11b

Commits on Mar 14, 2017

• Fix OpenSSL deprecation warning

  Show description for 68f407c
  

  newtrat

  committed
  68f407c

  Copy full SHA for 68f407c

• Add new encryption algorithm to Encryptor test

  Show description for 57517e5
  

  newtrat

  committed
  57517e5

  Copy full SHA for 57517e5

Commits on Mar 18, 2017

• Check and use if newer bypass_sign_in method exists in devise

  

  Philipp Staender

  authored
  0d9bc8d

  Copy full SHA for 0d9bc8d

Commits on Mar 26, 2017

• Merge pull request #115 from pstaender/master

  Show description for 82fb6b1
  Houdini

  authored
  82fb6b1

  Copy full SHA for 82fb6b1

Commits on May 1, 2017

• Switch badges to vector in README

  Show description for 4419777
  rmm5t

  authored
  4419777

  Copy full SHA for 4419777

• Merge pull request #120 from rmm5t/patch-1

  Show description for 6cf659a
  Houdini

  authored
  6cf659a

  Copy full SHA for 6cf659a

Commits on May 11, 2017

• fix test in models/two_factor_authenticatable_spec.rb

  Houdini

  committed
  96abae0

  Copy full SHA for 96abae0

Commits on May 29, 2017

• Doc change re otp_secret_key for version 1 to 2 upgrade

  Show description for 2123660
  edsimpson

  committed
  2123660

  Copy full SHA for 2123660

Commits on May 30, 2017

• Merge pull request #122 from edsimpson/otp-secret-key-not-needed-doc-change

  Show description for 13ea083
  Houdini

  authored
  13ea083

  Copy full SHA for 13ea083

• Merge pull request #114 from newtrat/fix-test-and-deprecations

  Show description for 20c9d14
  Houdini

  authored
  20c9d14

  Copy full SHA for 20c9d14

Commits on Jul 5, 2017

• dynamically generate path based on resource scope

  jskirst

  committed
  93674d2

  Copy full SHA for 93674d2

Commits on Jul 14, 2017

• Makes encrypt/decrypt method names unique:

  Show description for 38803d8
  leanucci

  committed
  38803d8

  Copy full SHA for 38803d8

Commits on Jul 18, 2017

• Merge pull request #126 from leanucci/encryption_methods_unique_names

  Show description for 0df4c17
  Houdini

  authored
  0df4c17

  Copy full SHA for 0df4c17

• Bump to version 2.0.1

  Houdini

  committed
  9c1af25

  Copy full SHA for 9c1af25

Commits on Jul 31, 2017

• Merge pull request #125 from jskirst/scopeable-view

  Show description for d43c7d8
  Houdini

  authored
  d43c7d8

  Copy full SHA for d43c7d8

Commits on Nov 3, 2017

• Update README.md

  poctek

  authored
  5865994

  Copy full SHA for 5865994

Commits on Nov 6, 2017

• Merge pull request #130 from poctek/patch-3

  Show description for f59001c
  Houdini

  authored
  f59001c

  Copy full SHA for f59001c

Commits on Dec 2, 2017

• Merge pull request #109 from benjaminwols/delete-cookie-on-logout

  Show description for 9bb3e65
  Houdini

  authored
  9bb3e65

  Copy full SHA for 9bb3e65

Commits on Jan 19, 2018

• Fix README markdown formatting

  rmm5t

  authored
  8c37495

  Copy full SHA for 8c37495

Commits on Jan 29, 2018

• Remove duplicate pry entry in Gemfile

  Show description for ea27bcd
  rmm5t

  committed
  ea27bcd

  Copy full SHA for ea27bcd

• Enhance travis build matrix for supported Ruby and Rails versions

  Show description for bf37c45
  rmm5t

  committed
  bf37c45

  Copy full SHA for bf37c45

• Upgrade capybara for Rails 5 support

  rmm5t

  committed
  ce054cd

  Copy full SHA for ce054cd

• Add Rails 5 support to specs

  Show description for f6b011d
  rmm5t

  committed
  f6b011d

  Copy full SHA for f6b011d

• Only run Ruby 2.2 against Rails 4

  rmm5t

  committed
  5bf0aaf

  Copy full SHA for 5bf0aaf

• Made Rails 5.1 the "default" version of rails in Gemfile

  rmm5t

  committed
  6050115

  Copy full SHA for 6050115

• Normalize migrations between Rails 4 and Rails 5

  rmm5t

  committed
  f677f1f

  Copy full SHA for f677f1f

• Delegate logic of send_new_otp to user#send_new_otp_after_login?

  Show description for 91e8eb4
  rmm5t

  committed
  91e8eb4

  Copy full SHA for 91e8eb4

Commits on Jan 30, 2018

• Merge pull request #141 from rmm5t/delegate-send-new-otp-logic-to-user-model

  Show description for 6e24299
  Houdini

  authored
  6e24299

  Copy full SHA for 6e24299

Commits on Feb 8, 2018

• Return JSON with 'redirect_to' when handle_failed_second_factor

  Kevinrob

  authored
  a9e9093

  Copy full SHA for a9e9093

Commits on Mar 29, 2018

• Bump to version 2.1.0

  Houdini

  committed
  0cad30d

  Copy full SHA for 0cad30d

Commits on Jun 7, 2018

• Replace render :nothing with head

  Show description for f448cc7
  billkirtley

  committed
  f448cc7

  Copy full SHA for f448cc7

Commits on Jul 10, 2018

• Fix integer to seconds in remember_otp_session_for_seconds

  Laykou

  authored
  8b3c424

  Copy full SHA for 8b3c424

• Merge pull request #149 from Laykou/patch-1

  Show description for 8546040
  Houdini

  authored
  8546040

  Copy full SHA for 8546040

• Bump to version 2.1.1

  Houdini

  committed
  e5aaf16

  Copy full SHA for e5aaf16

Commits on Aug 27, 2018

• Load ActiveRecord functionality only if ActiveRecord itself is loaded

  cesarizu

  committed
  b57edd5

  Copy full SHA for b57edd5

• Merge pull request #142 from rmm5t/improve-travis-matrix

  Show description for 05ee43c
  Houdini

  authored
  05ee43c

  Copy full SHA for 05ee43c

• Merge pull request #153 from GovSciences/active_record_fixes

  Show description for dd2ccc8
  Houdini

  authored
  dd2ccc8

  Copy full SHA for dd2ccc8

• Merge pull request #148 from actblue/rails_51

  Show description for 5cb982a
  Houdini

  authored
  5cb982a

  Copy full SHA for 5cb982a

Commits on Oct 25, 2018

• Strip Spaces from TOTP Code

  Show description for 8887bab
  trianglegrrl

  committed
  8887bab

  Copy full SHA for 8887bab

Commits on Nov 1, 2018

• Merge pull request #156 from PrecisionNutrition/remove-spaces-from-otp-code

  Show description for 972e455
  Houdini

  authored
  972e455

  Copy full SHA for 972e455

Commits on Nov 27, 2018

• fix rotp 4 breaking authenticate totp

  

  Andrés Riveros

  committed
  d462080

  Copy full SHA for d462080

• rotp 4.0.0 dependency

  

  Andrés Riveros

  committed
  edcbc38

  Copy full SHA for edcbc38

Commits on Nov 30, 2018

• Update README.md

  Show description for dbd14d6
  Tectract

  committed
  dbd14d6

  Copy full SHA for dbd14d6

Commits on Jan 21, 2019

• default param padded removed

  

  Andrés Riveros

  committed
  3365885

  Copy full SHA for 3365885

• 16 to 32 lenght

  

  Andrés Riveros

  committed
  5fd39c1

  Copy full SHA for 5fd39c1

• bundler 2 and rails 4.2 conflict

  

  Andrés Riveros

  committed
  afd2003

  Copy full SHA for afd2003

Commits on Jan 26, 2019

• Update README.md

  Show description for 06bfb50
  MarkFChavez

  authored
  06bfb50

  Copy full SHA for 06bfb50

Commits on Jan 29, 2019

• Merge pull request #159 from resitcl/master

  Show description for 1d6c978
  Houdini

  authored
  1d6c978

  Copy full SHA for 1d6c978

• Merge pull request #165 from MarkFChavez/patch-1

  Show description for d6a050a
  Houdini

  authored
  d6a050a

  Copy full SHA for d6a050a

• Merge pull request #160 from Tectract/master

  Show description for 81762fe
  Houdini

  authored
  81762fe

  Copy full SHA for 81762fe

• update spec schema.rb

  Houdini

  committed
  dd72a24

  Copy full SHA for dd72a24

• bump version to 2.2.0

  Houdini

  committed
  f904248

  Copy full SHA for f904248

Commits on Feb 1, 2019

• Add german translations

  JanBussieck

  committed
  153b016

  Copy full SHA for 153b016

Commits on Feb 7, 2019

• Merge pull request #166 from JanBussieck/add_german_translations

  Show description for 90e31a4
  Houdini

  authored
  90e31a4

  Copy full SHA for 90e31a4

• Merge pull request #139 from rmm5t/patch-1

  Show description for 859cec9
  Houdini

  authored
  859cec9

  Copy full SHA for 859cec9

Commits on Feb 21, 2019

• Update README

  Show description for 8170ec0
  

  Ace Subido and Mark Chavez

  authored and

  MarkFChavez

  committed
  8170ec0

  Copy full SHA for 8170ec0

Commits on Apr 19, 2019

• Merge pull request #168 from MarkFChavez/master

  Show description for cab2aaf
  Houdini

  authored
  cab2aaf

  Copy full SHA for cab2aaf

Commits on May 23, 2019

• Merge pull request #143 from Kevinrob/patch-1

  Show description for 7d49400
  Houdini

  authored
  7d49400

  Copy full SHA for 7d49400

Commits on Jun 14, 2019

• Use ROTP::Base32.random instead of ROTP::Base32.random_base32 if available

  

  Jasper van den Berg

  committed
  8f9377b

  Copy full SHA for 8f9377b

Commits on Jul 4, 2019

• Merge pull request #171 from jaspervandenberg/newer_rotp_support

  Show description for 20544c7
  Houdini

  authored
  20544c7

  Copy full SHA for 20544c7

• Additional comments in generate_totp_secret method

  Houdini

  committed
  82e5aff

  Copy full SHA for 82e5aff

Commits on Jul 23, 2019

• Autofocus MFA code text field

  Show description for 2d3650d
  gustavokitman

  authored
  2d3650d

  Copy full SHA for 2d3650d

Commits on Jul 25, 2019

• Merge pull request #174 from gustavokitman/patch-1

  Show description for 2229ead
  Houdini

  authored
  2229ead

  Copy full SHA for 2229ead

Commits on Sep 17, 2020

• Make current migration safe using index concurrently

  

  Przemyslaw Mroczek

  committed
  c21a935

  Copy full SHA for c21a935

Commits on Sep 18, 2020

• Merge pull request #197 from Lackoftactics/index_concurrently

  Show description for 7e0faa6
  Houdini

  authored
  7e0faa6

  Copy full SHA for 7e0faa6

Commits on Feb 25, 2021

• Added license tag (MIT) to gemspec

  alessio-signorini

  authored
  a0b2ed0

  Copy full SHA for a0b2ed0

Commits on Mar 12, 2021

• Merge pull request #199 from alessio-signorini/patch-1

  Show description for c68d9ea
  Houdini

  authored
  c68d9ea

  Copy full SHA for c68d9ea