a4550e51ea 
								
									
								
							
								 
							
						 
						
							
							
								
								Update dependencies and add /ciphers/create  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								5edbd0e952 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into rocket-0.4  
							
							
 
							
							
							# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								1d4944b88e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #258  from Bruceforce/master  
							
							
 
							
							
							Update backup section of README.md 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								660c8f8d7e 
								
							
								 
							
						 
						
							
							
								
								Use dockerhub instead of gitlab registry for README.md  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								478fc0c9dd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master'  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a2de4ce40e 
								
							
								 
							
						 
						
							
							
								
								Improved the backup section of sqlite3 database  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								17052b665f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #257  from Step7750/fix-nfc-mobile  
							
							
 
							
							
							Fixes NFC Response for Mobile Yubikey OTP Login 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f344dbaad4 
								
							
								 
							
						 
						
							
							
								
								Fixes NFC Response for Mobile Login  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								c5c9e3fd65 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #254  from Step7750/master  
							
							
 
							
							
							Adds Yubikey OTP Support 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								aba9c28226 
								
							
								 
							
						 
						
							
							
								
								Disable Yubikey 2FA if 0 Keys Provided  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								82e2b8a8c0 
								
							
								 
							
						 
						
							
							
								
								Code style changes  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5a8d5e426d 
								
							
								 
							
						 
						
							
							
								
								Switches to Downstream yubico with Optional libusb  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								f9ecb7201b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #256  from mprasil/fix_accepted_sync  
							
							
 
							
							
							Prevent accepted user from seeing ciphers until confirmed (fixes  #196 ) 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								044cf19913 
								
							
								 
							
						 
						
							
							
								
								Prevent accepted user from seeing ciphers until confirmed ( fixes   #196 )  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2c233cda8b 
								
							
								 
							
						 
						
							
							
								
								Adds Yubikey OTP Support to Readme  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6d735806c0 
								
							
								 
							
						 
						
							
							
								
								Ensures Yubico Creds are set when opening Yubikey Modal  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2433d39df5 
								
							
								 
							
						 
						
							
							
								
								Allows Custom Yubico OTP Server  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9e0e4b13c5 
								
							
								 
							
						 
						
							
							
								
								Adds Yubikey OTP Support  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e66436625c 
								
							
								 
							
						 
						
							
							
								
								Adds Yubico Client ID and Secret Key Env Vars  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								24a4478b5c 
								
							
								 
							
						 
						
							
							
								
								Adds yubico-rs library dep  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								f84cbeaaf8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into rocket-0.4  
							
							
 
							
							
							# Conflicts:
#	src/db/models/organization.rs 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								3cb911a52f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #243  from mprasil/vault_2.5.0  
							
							
 
							
							
							Bump vault version to 2.5.0 [wip] 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dd684753d0 
								
							
								 
							
						 
						
							
							
								
								Fix gt()  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f3e6cc6ffd 
								
							
								 
							
						 
						
							
							
								
								Set PartialOrd to consider invalid i32 UserOrgType lower than anything  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b94f4db52a 
								
							
								 
							
						 
						
							
							
								
								Fix   #242  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								66a4c5d48b 
								
							
								 
							
						 
						
							
							
								
								Implement comparison between i32 and UserOrgType  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b4e222d598 
								
							
								 
							
						 
						
							
							
								
								Bump vault version to 2.5.0  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								dd00591082 
								
									
								
							
								 
							
						 
						
							
							
								
								Add info about how to  fix   #176  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								4638786507 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into rocket-0.4  
							
							
 
							
							
							# Conflicts:
#	src/api/core/mod.rs 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								1e9dd2fd4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #244  from RomanHargrave/multiple-u2f  
							
							
 
							
							
							Make U2F work with vault 2.4.0 changes 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								62bc58e145 
								
							
								 
							
						 
						
							
							
								
								Clean up after u2f endpoint split  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								760e0ab805 
								
							
								 
							
						 
						
							
							
								
								Initial u2f fix  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								6eb1c3d638 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed change in organizations header, now Request::get_param() are indexed by segment, not dynamic parameter.  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f408efc927 
								
							
								 
							
						 
						
							
							
								
								Also remove libs from other platforms Dockerfiles  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9b20247fc2 
								
							
								 
							
						 
						
							
							
								
								Remove libs from Dockerfile  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								8f5bfe7938 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #240  from mprasil/balenalib  
							
							
 
							
							
							Switch from resin to balenalib 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b359df7045 
								
							
								 
							
						 
						
							
							
								
								Switch from resin to balenalib  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								e844f41abc 
								
									
								
							
								 
							
						 
						
							
							
								
								Make the docker images use port 80 (instead of 8000, which is the default in rocket 0.4)  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								bc532f54d5 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve login query parsing  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								c673370103 
								
									
								
							
								 
							
						 
						
							
							
								
								Updated bw_rs to Rocket version 0.4-rc1  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								f1b1000600 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #239  from mprasil/admin_warning  
							
							
 
							
							
							Improve the admin account warning. 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c0e248c457 
								
							
								 
							
						 
						
							
							
								
								Improve the admin account warning.  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								f510a1b060 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #236  from xMateMCPE/patch-1  
							
							
 
							
							
							Grammar fixes to README.md 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								fafc3883c6 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								1bdb98d139 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #234  from icicimov/kubernetes-aws  
							
							
 
							
							
							Add Kubernetes deployment reference 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2f5ca88fb1 
								
							
								 
							
						 
						
							
							
								
								Readme typo fix  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e7a24159c5 
								
							
								 
							
						 
						
							
							
								
								Add Kubernetes deployment reference with proper section and short description  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e056cc8178 
								
							
								 
							
						 
						
							
							
								
								Add Kubernetes deployment reference  
							
							
								
 
							
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								8ce4c79612 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from Toucan-Sam/patch-2  
							
							
 
							
							
							Update PROXY.md 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
								
								
							
							
								
							
								77d9641323 
								
									
								
							
								 
							
						 
						
							
							
								
								Update PROXY.md  
							
							
 
							
							
							Removed: `include conf.d/proxy-confs/proxy.conf;` lines because they're specific to user (shauder) and will break nginx if copy-pasted/don't exist.
Changed: Moved listen value and server_name to top as is standard for nginx configs
Changed: Commented out SSL config as it's specific to user (shauder) and will break if copy-pasted/don't exist. But is still useful and a good idea for simplifying nginx config.
Changed: Rearranged location blocks because OCD. First /, then /notifications/hub, then /notifications/hub/negotiate because it looks nicer in a tree where each location grows. 
							
						 
						7 years ago