| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Daniel García | 9eaa9c1a17 | Add WEBSOCKET_ADDRESS config option (Fixes #199) | 2018-09-28 13:50:04 +02:00 |  | 
			
				
					| 
							
							
								 Daniel García | 3df31e3464 | Temp fix for OpenSSL 1.1.1 compatibility | 2018-09-19 21:45:50 +02: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 | 948554a20f | Added config option for websocket port, and reworked the config parsing a bit. Added SMTP_FROM config to examples and made it mandatory, it doesn't make much sense to not specify the from address. | 2018-09-13 20:59:51 +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 | d66d4fd87f | Add error message when the proxy doesn't route websockets correctly | 2018-09-11 17:09:33 +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 |  | 
			
				
					| 
							
							
								 Jean-Christophe BEGUE | 1c641d7635 | Special messages when user has no password hint | 2018-09-11 13:04:34 +02:00 |  | 
			
				
					| 
							
							
								 Jean-Christophe BEGUE | e2ab2f7306 | Save None instead of empty password hint | 2018-09-11 13:00:59 +02:00 |  |