| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 Miroslav Prasil | 044cf19913 | Prevent accepted user from seeing ciphers until confirmed (fixes #196) | 2018-11-16 14:21:26 +00: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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 Daniel García | bc532f54d5 | Improve login query parsing | 2018-11-01 19:25:10 +01: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 |  | 
			
				
					| 
							
							
								 Miroslav Prasil | 2e7fa6440b | Do not spawn WS thread if it's disabled | 2018-10-15 15:08:15 +01:00 |  | 
			
				
					| 
							
							
								 Miroslav Prasil | 9ecc98c3cc | Disable WebSockets negotiation by default | 2018-10-14 23:25:16 +01: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 |  | 
			
				
					| 
							
							
								 Daniel García | faec050a6d | Merge pull request #217 from janost/refactor-device-save Device::save() should return QueryResult instead of bool | 2018-10-14 17:35:59 +02:00 |  | 
			
				
					| 
							
							
								 janost | 58a78ffa54 | Device::save() should return QueryResult instead of bool | 2018-10-14 16:17:37 +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 |  | 
			
				
					| 
							
							
								 Daniel García | ce4fedf191 | Change error response to be closer to upstream | 2018-10-10 20:37:04 +02: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 | 54f54ee845 | Update revision for users on collection save | 2018-10-01 17:04:15 +01:00 |  | 
			
				
					| 
							
							
								 Miroslav Prasil | c3c74506a7 | Add missing fields to returned Org json | 2018-10-01 16:00:11 +01:00 |  | 
			
				
					| 
							
							
								 Miroslav Prasil | fb4e6bab14 | Clean up the share_collection handling | 2018-10-01 15:59:10 +01:00 |  |