Daniel García
							
						 
					 | 
					
						
						
							
						
						0f6ab01f77
					 | 
					
						
						
							
							Merge pull request #268 from mprasil/master
						
						
						
						
						
						
						
						fix bad path in Alpine Dockerfile 
						
						
							
						
					 | 
					
						2018-11-22 03:06:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						0935cb90a4
					 | 
					
						
						
							
							fix bad path in Alpine Dockerfile
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-21 23:35:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						e86cac984a
					 | 
					
						
						
							
							Merge pull request #263 from mprasil/master
						
						
						
						
						
						
						
						Update dockerfile for alpine, armv7 and aarch64 
						
						
							
						
					 | 
					
						2018-11-21 15:57:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						f1acc1e05a
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-21 15:35:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						3d36ac4601
					 | 
					
						
						
							
							Remove unwrap in connection_lost
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-21 15:07:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						bf1c96695b
					 | 
					
						
						
							
							Update dockerfile for alpine, armv7 and aarch64
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-20 14:55:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						9ecb29883c
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	Cargo.lock 
						
						
							
						
					 | 
					
						2018-11-19 20:59:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						8b3e87cfe0
					 | 
					
						
						
							
							Update lockfile to fix yubico error
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-19 20:58:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						e5af230315
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	Cargo.toml 
						
						
							
						
					 | 
					
						2018-11-19 20:45:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						a1da82c868
					 | 
					
						
						
							
							Add online feature to yubico
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-19 20:45:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						981a324027
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	src/api/core/mod.rs 
						
						
							
						
					 | 
					
						2018-11-19 20:30:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						00abd4c853
					 | 
					
						
						
							
							Add create endpoint, fixes #253, fixes #261
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-19 20:27:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						a4550e51ea
					 | 
					
						
						
							
							Update dependencies and add /ciphers/create
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-19 20:21:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						5edbd0e952
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs 
						
						
							
						
					 | 
					
						2018-11-19 19:52:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						1d4944b88e
					 | 
					
						
						
							
							Merge pull request #258 from Bruceforce/master
						
						
						
						
						
						
						
						Update backup section of README.md 
						
						
							
						
					 | 
					
						2018-11-19 19:36:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								10
							
						 
					 | 
					
						
						
							
						
						660c8f8d7e
					 | 
					
						
						
							
							Use dockerhub instead of gitlab registry for README.md
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-18 14:06:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								10
							
						 
					 | 
					
						
						
							
						
						478fc0c9dd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-18 03:23:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								10
							
						 
					 | 
					
						
						
							
						
						a2de4ce40e
					 | 
					
						
						
							
							Improved the backup section of sqlite3 database
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-18 03:22:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						17052b665f
					 | 
					
						
						
							
							Merge pull request #257 from Step7750/fix-nfc-mobile
						
						
						
						
						
						
						
						Fixes NFC Response for Mobile Yubikey OTP Login 
						
						
							
						
					 | 
					
						2018-11-17 15:28:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						f344dbaad4
					 | 
					
						
						
							
							Fixes NFC Response for Mobile Login
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-17 01:25:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						c5c9e3fd65
					 | 
					
						
						
							
							Merge pull request #254 from Step7750/master
						
						
						
						
						
						
						
						Adds Yubikey OTP Support 
						
						
							
						
					 | 
					
						2018-11-16 20:39:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						aba9c28226
					 | 
					
						
						
							
							Disable Yubikey 2FA if 0 Keys Provided
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-16 12:07:00 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						82e2b8a8c0
					 | 
					
						
						
							
							Code style changes
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-16 11:52:01 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						5a8d5e426d
					 | 
					
						
						
							
							Switches to Downstream yubico with Optional libusb
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-16 11:28:20 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						f9ecb7201b
					 | 
					
						
						
							
							Merge pull request #256 from mprasil/fix_accepted_sync
						
						
						
						
						
						
						
						Prevent accepted user from seeing ciphers until confirmed (fixes #196) 
						
						
							
						
					 | 
					
						2018-11-16 16:17:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						044cf19913
					 | 
					
						
						
							
							Prevent accepted user from seeing ciphers until confirmed (fixes #196)
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-16 14:21:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						2c233cda8b
					 | 
					
						
						
							
							Adds Yubikey OTP Support to Readme
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:59:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						6d735806c0
					 | 
					
						
						
							
							Ensures Yubico Creds are set when opening Yubikey Modal
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:58:44 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						2433d39df5
					 | 
					
						
						
							
							Allows Custom Yubico OTP Server
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:54:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						9e0e4b13c5
					 | 
					
						
						
							
							Adds Yubikey OTP Support
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:43:09 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						e66436625c
					 | 
					
						
						
							
							Adds Yubico Client ID and Secret Key Env Vars
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:40:27 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						24a4478b5c
					 | 
					
						
						
							
							Adds yubico-rs library dep
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-15 18:34:17 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						f84cbeaaf8
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	src/db/models/organization.rs 
						
						
							
						
					 | 
					
						2018-11-14 16:14:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						3cb911a52f
					 | 
					
						
						
							
							Merge pull request #243 from mprasil/vault_2.5.0
						
						
						
						
						
						
						
						Bump vault version to 2.5.0 [wip] 
						
						
							
						
					 | 
					
						2018-11-14 16:12:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						dd684753d0
					 | 
					
						
						
							
							Fix gt()
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-13 21:38:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						f3e6cc6ffd
					 | 
					
						
						
							
							Set PartialOrd to consider invalid i32 UserOrgType lower than anything
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-13 16:34:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						b94f4db52a
					 | 
					
						
						
							
							Fix #242
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-13 15:34:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						66a4c5d48b
					 | 
					
						
						
							
							Implement comparison between i32 and UserOrgType
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-12 17:13:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						b4e222d598
					 | 
					
						
						
							
							Bump vault version to 2.5.0
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-12 10:41:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						dd00591082
					 | 
					
						
						
							
							Add info about how to fix #176
						
						
						
						
						
						
							
 1.4.0
						
					 | 
					
						2018-11-09 16:24:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						4638786507
					 | 
					
						
						
							
							Merge branch 'master' into rocket-0.4
						
						
						
						
						
						
						
						# Conflicts:
#	src/api/core/mod.rs 
						
						
							
						
					 | 
					
						2018-11-09 16:06:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						1e9dd2fd4e
					 | 
					
						
						
							
							Merge pull request #244 from RomanHargrave/multiple-u2f
						
						
						
						
						
						
						
						Make U2F work with vault 2.4.0 changes 
						
						
							
						
					 | 
					
						2018-11-09 15:47:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Hargrave
							
						 
					 | 
					
						
						
							
						
						62bc58e145
					 | 
					
						
						
							
							Clean up after u2f endpoint split
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-09 00:27:43 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Hargrave
							
						 
					 | 
					
						
						
							
						
						760e0ab805
					 | 
					
						
						
							
							Initial u2f fix
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-09 00:00:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						6eb1c3d638
					 | 
					
						
						
							
							Fixed change in organizations header, now Request::get_param() are indexed by segment, not dynamic parameter.
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-06 16:53:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						f408efc927
					 | 
					
						
						
							
							Also remove libs from other platforms Dockerfiles
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-03 18:56:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						9b20247fc2
					 | 
					
						
						
							
							Remove libs from Dockerfile
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-03 18:54:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						8f5bfe7938
					 | 
					
						
						
							
							Merge pull request #240 from mprasil/balenalib
						
						
						
						
						
						
						
						Switch from resin to balenalib 
						
						
							
						
					 | 
					
						2018-11-03 14:48:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						b359df7045
					 | 
					
						
						
							
							Switch from resin to balenalib
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-03 10:25:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						e844f41abc
					 | 
					
						
						
							
							Make the docker images use port 80 (instead of 8000, which is the default in rocket 0.4)
						
						
						
						
						
						
							
						
					 | 
					
						2018-11-01 19:25:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |