Daniel García
							
						 
					 | 
					
						
						
							
						
						94810c106a
					 | 
					
						
						
							
							Migrate to rust 2018 edition
						
						
						
						
						
						
					 | 
					
						2018-12-07 02:05:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						2fde4e6933
					 | 
					
						
						
							
							Implemented proper logging, with support for file logging, timestamp and syslog (this last one is untested)
						
						
						
						
						
						
					 | 
					
						2018-12-06 20:35:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						dc1bb6de20
					 | 
					
						
						
							
							Update device push token methods to more closely follow the official server response
						
						
						
						
						
						
					 | 
					
						2018-12-06 16:28:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						6364c05789
					 | 
					
						
						
							
							Fix attachments during key rotation, add individual attachment key
						
						
						
						
						
						
					 | 
					
						2018-11-27 17:24:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						f71f10eac6
					 | 
					
						
						
							
							Implemented key rotation with the latest vault
						
						
						
						
						
						
					 | 
					
						2018-11-24 23:00:41 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stepan Fedorko-Bartos
							
						 
					 | 
					
						
						
							
						
						f344dbaad4
					 | 
					
						
						
							
							Fixes NFC Response for Mobile Login
						
						
						
						
						
						
					 | 
					
						2018-11-17 01:25:07 -07: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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						c673370103
					 | 
					
						
						
							
							Updated bw_rs to Rocket version 0.4-rc1
						
						
						
						
						
						
					 | 
					
						2018-11-01 19:25:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						c32c65d367
					 | 
					
						
						
							
							Accept PUT and POST on /settings/domains, returns JsonResult, fixes saving Custom Equivalent Domains
						
						
						
						
						
						
					 | 
					
						2018-10-23 00:32:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						daa66b08dc
					 | 
					
						
						
							
							Fix /sync without query string
						
						
						
						
						
						
					 | 
					
						2018-10-19 00:54:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						55fbd8d468
					 | 
					
						
						
							
							Don't send Domains if excludeDomains=true on /sync
						
						
						
						
						
						
					 | 
					
						2018-10-17 23:22:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						02fd68d63b
					 | 
					
						
						
							
							Merge pull request #218 from janost/refactor-folder-save
						
						
						
						
						
						
						
						Folder::save() should return QueryResult instead of bool 
						
						
					 | 
					
						2018-10-14 20:07:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						e985221b50
					 | 
					
						
						
							
							User::save() should return QueryResult instead of bool
						
						
						
						
						
						
					 | 
					
						2018-10-14 19:33:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						77cf63c06d
					 | 
					
						
						
							
							Folder::save() should return QueryResult instead of bool
						
						
						
						
						
						
					 | 
					
						2018-10-14 18:25:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						64f6c60bfd
					 | 
					
						
						
							
							Organization::save() and UserOrganization::save() should return QueryResult instead of bool
						
						
						
						
						
						
					 | 
					
						2018-10-14 16:04:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						a28caa33ef
					 | 
					
						
						
							
							Implement poor man's admin panel
						
						
						
						
						
						
					 | 
					
						2018-10-12 15:20:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						5292d38c73
					 | 
					
						
						
							
							CollectionCipher::save() and delete() should return QueryResult instead of bool
						
						
						
						
						
						
					 | 
					
						2018-10-07 11:06:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						1049646e27
					 | 
					
						
						
							
							Merge pull request #210 from janost/cipher-save-refactor
						
						
						
						
						
						
						
						Cipher::save() should return QueryResult instead of bool 
						
						
					 | 
					
						2018-10-06 16:08:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						380cf06211
					 | 
					
						
						
							
							Cipher::save() should return QueryResult instead of bool
						
						
						
						
						
						
					 | 
					
						2018-10-06 14:13:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janost
							
						 
					 | 
					
						
						
							
						
						c29bc9309a
					 | 
					
						
						
							
							Return proper error message for org reinvite
						
						
						
						
						
						
					 | 
					
						2018-10-05 12:29:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						7112c86471
					 | 
					
						
						
							
							Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file
						
						
						
						
						
						
					 | 
					
						2018-10-04 00:01:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						2aabf14372
					 | 
					
						
						
							
							Merge pull request #206 from mprasil/collection_revision
						
						
						
						
						
						
						
						Collection update updates User revision 
						
						
					 | 
					
						2018-10-01 19:31:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						d9457e929c
					 | 
					
						
						
							
							Add continuation token when we return object list
						
						
						
						
						
						
					 | 
					
						2018-10-01 17:55:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						86b49856a7
					 | 
					
						
						
							
							Handle return value from Collection::save()
						
						
						
						
						
						
					 | 
					
						2018-10-01 17:50:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						fb4e6bab14
					 | 
					
						
						
							
							Clean up the share_collection handling
						
						
						
						
						
						
					 | 
					
						2018-10-01 15:59:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						ebb66c374e
					 | 
					
						
						
							
							Implement KDF iterations change (Fixes #195)
						
						
						
						
						
						
					 | 
					
						2018-09-19 17:30:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						f7951b44ba
					 | 
					
						
						
							
							Add alias for DELETE call on accounts
						
						
						
						
						
						
					 | 
					
						2018-09-18 11:13:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						b75ba216d1
					 | 
					
						
						
							
							Return default prelogin values when the user doesn't exist
						
						
						
						
						
						
					 | 
					
						2018-09-13 23:04:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						8651df8c2a
					 | 
					
						
						
							
							Fixed some lint issues
						
						
						
						
						
						
					 | 
					
						2018-09-13 21:55:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						928e2424c0
					 | 
					
						
						
							
							Updated dependencies and fixed errors
						
						
						
						
						
						
					 | 
					
						2018-09-13 16:05:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						a01fee0b9f
					 | 
					
						
						
							
							Merge branch 'ws'
						
						
						
						
						
						
						
						# Conflicts:
#	Cargo.toml
#	src/api/core/ciphers.rs
#	src/main.rs 
						
						
					 | 
					
						2018-09-13 15:59:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						f397f0cbd0
					 | 
					
						
						
							
							Implement organization import for admins and owners (Fixes #178)
						
						
						
						
						
						
					 | 
					
						2018-09-13 15:16:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						3e1afb139c
					 | 
					
						
						
							
							Remove unnecessary return
						
						
						
						
						
						
					 | 
					
						2018-09-12 23:58:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						1b20a25514
					 | 
					
						
						
							
							Merge pull request #173 from mprasil/poormans_invites
						
						
						
						
						
						
						
						Implement poor man's invitation via Organization invitation 
						
						
					 | 
					
						2018-09-11 16:48:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						c1cd4d9a6b
					 | 
					
						
						
							
							Modify User::new to be keyless and paswordless
						
						
						
						
						
						
					 | 
					
						2018-09-11 14:25:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						b63693aefb
					 | 
					
						
						
							
							Merge pull request #137 from stammw/master
						
						
						
						
						
						
						
						SMTP implementation, along with password HINT email 
						
						
					 | 
					
						2018-09-11 14:58:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						ec05f14f5a
					 | 
					
						
						
							
							Implement poor man's invitation via Organization invitation
						
						
						
						
						
						
					 | 
					
						2018-09-11 13:09:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-Christophe BEGUE
							
						 
					 | 
					
						
						
							
						
						37d88be2be
					 | 
					
						
						
							
							return an error when email adress for password hint is not valid
						
						
						
						
						
						
					 | 
					
						2018-09-11 13:12:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |