Two factor authentication (#7751) (9d5b9818) · Commits · Gigadoc 2 / diaspora

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ app/assets/images/custom/
		# Configuration files
		config/diaspora.yml
		config/initializers/secret_token.rb
		config/initializers/twofa_encryption_key.rb
		.bundle
		vendor/bundle/
		vendor/cache/

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,8 +5,9 @@
		## Bug fixes

		## Features
		* Add a manifest.json file as a first step to make diaspora* a Progressive Web App [#7998](https://github.com/diaspora/diaspora/pull/7998)
		* Add a manifest.json file as a first step to make diaspora\* a Progressive Web App [#7998](https://github.com/diaspora/diaspora/pull/7998)
		* Allow `web+diaspora://` links to link to a profile with only the diaspora ID [#8000](https://github.com/diaspora/diaspora/pull/8000)
		* Support TOTP two factor authentication [#7751](https://github.com/diaspora/diaspora/pull/7751)

		# 0.7.10.0

+2 −0

+14 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ GEM
		mime-types (>= 2.99)
		unf
		ast (2.4.0)
		attr_encrypted (3.1.0)
		encryptor (~> 3.0.0)
		attr_required (1.0.1)
		autoprefixer-rails (8.6.5)
		execjs
		@@ -169,6 +171,12 @@ GEM
		railties (>= 4.1.0, < 6.0)
		responders
		warden (~> 1.2.3)
		devise-two-factor (3.0.3)
		activesupport (< 5.3)
		attr_encrypted (>= 1.3, < 4, != 2)
		devise (~> 4.0)
		railties (< 5.3)
		rotp (~> 2.0)
		devise_lastseenable (0.0.6)
		devise
		rails (>= 3.0.4)
		@@ -191,6 +199,7 @@ GEM
		docile (1.3.1)
		domain_name (0.5.20180417)
		unf (>= 0.0.5, < 1.0.0)
		encryptor (3.0.0)
		entypo-rails (3.0.0)
		railties (>= 4.1, < 6)
		equalizer (0.0.11)
		@@ -596,6 +605,9 @@ GEM
		responders (2.4.1)
		actionpack (>= 4.2.0, < 6.0)
		railties (>= 4.2.0, < 6.0)
		rotp (2.1.2)
		rqrcode (0.10.1)
		chunky_png (~> 1.0)
		rspec (3.8.0)
		rspec-core (~> 3.8.0)
		rspec-expectations (~> 3.8.0)
		@@ -785,6 +797,7 @@ DEPENDENCIES
		cucumber-rails (= 1.6.0)
		database_cleaner (= 1.7.0)
		devise (= 4.6.1)
		devise-two-factor (= 3.0.3)
		devise_lastseenable (= 0.0.6)
		diaspora-prosody-config (= 0.0.7)
		diaspora_federation-json_schema (= 0.2.6)
		@@ -876,6 +889,7 @@ DEPENDENCIES
		redcarpet (= 3.4.0)
		redis (= 3.3.5)
		responders (= 2.4.1)
		rqrcode (= 0.10.1)
		rspec-json_expectations (~> 2.1)
		rspec-rails (= 3.8.2)
		rubocop (= 0.66.0)

+1 −0