| 
							
							
								 Daniel García | f571df7367 | Revert yubikey feature, not needed anymore | 2019-01-12 15:28:41 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 1d7f704754 | Send CipherUpdate when adding and deleting attachments | 2019-01-11 01:12:54 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 1d034749f7 | Fix AArch64 build by disabling yubico | 2019-01-10 23:54:01 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 320266606e | Implement put collections | 2019-01-08 20:27:28 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 4309df8334 | Only create invitations when SMTP is disabled, and ignore invitations if we have a token. Disallow users from accepting invitation twice | 2019-01-08 15:42:26 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | f1161c65fb | Make sure an invitation is created when reinviting | 2019-01-08 14:05:05 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 21b85b78b1 | Changed reinvite check and removed obsolete comment | 2019-01-07 15:29:57 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 5e37471488 | Merge pull request #323 from njfox/invite_accepted_email Send email notifications when invitations are accepted/confirmed | 2019-01-06 14:12:24 +01:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 0a74e79cea | Refactor generate_invite_claims, make org_name and org_id optional | 2019-01-05 23:03:49 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 7db66f73f0 | Refactor invited_by_email check | 2019-01-05 13:46:45 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | cec28a85ac | Update admin page to work with new invitation flow | 2019-01-04 10:32:51 -05:00 |  | 
			
				
					| 
							
							
								 Daniel García | 5f49ecd7f3 | Updated dependencies to use u2f crate directly, and some style changes | 2019-01-04 00:25:38 +01:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 736c0e62f2 | Send emails to inviters/invitees when invites are accepted/confirmed | 2019-01-02 22:20:39 -05:00 |  | 
			
				
					| 
							
							
								 Daniel García | 30e768613b | Start using rustfmt and some style changes to make some lines shorter | 2018-12-30 23:34:31 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 2bb0b15e04 | Implemented better errors for JWT | 2018-12-30 21:43:55 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 250a2b340f | Use new Errors in latest changes | 2018-12-30 21:43:55 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | b2fc0499f6 | Finish invite functionality, and remove virtual organization | 2018-12-30 21:40:26 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 6a99849a1e | Implemented proper error handling, now we can do user.save($conn)?;and it works.In the future, maybe we can do the same with the `find_by_id` methods that return an Option. | 2018-12-30 21:31:12 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 5fecf09631 | Initial version of admin panel, list users and reload user list works. No serious auth method yet, password is 'token123' | 2018-12-30 21:31:11 +01:00 |  | 
			
				
					| 
							
							
								 Nick Fox | f20c4705d9 | Refactor invite claims and disallow reinvites to virtual_org | 2018-12-30 00:19:01 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 3142d8d01f | Add more detail to invitation not found error | 2018-12-29 23:28:19 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 84fa5a4ed6 | Implement reinvite endpoint | 2018-12-29 23:24:38 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | b0ac640d8b | Use JWT to validate existing user invites | 2018-12-23 15:15:44 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 2cd736ab81 | Validate JWT if a user registers with SMTP invites enabled | 2018-12-20 22:16:41 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 99256b9b3a | Prefix unused params with underscore | 2018-12-20 21:37:03 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 26bf7bc12f | Use upstream jslib invite/registration workflow | 2018-12-18 23:16:03 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 9479108fb7 | Remove CONFIG.email_invitations | 2018-12-17 17:10:09 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 042c1072d9 | Remove CONFIG.email_invitation option | 2018-12-17 17:02:15 -05:00 |  | 
			
				
					| 
							
							
								 Nick Fox | 4910b14d57 | Implement email invitations and registration workflow | 2018-12-14 21:56:00 -05:00 |  | 
			
				
					| 
							
							
								 Daniel García | 19754c967f | More changes to the push token, and filtered multipart logs | 2018-12-07 18:25:18 +01:00 |  | 
			
				
					| 
							
							
								 Daniel García | 738ad2127b | Fixed some clippy linting issues | 2018-12-07 15:01:29 +01:00 |  | 
			
				
					| 
							
							
								 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 |  |