Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	34f2aa68f4  
						 
						
							
							
								
								
								Implement Collection-Cipher mapping  
							
							
							
						 
						
							2018-05-11 21:08:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	032134aabc  
						 
						
							
							
								
								
								Fixed some errors asigning collections to users  
							
							
							
						 
						
							2018-05-11 20:08:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	8298795087  
						 
						
							
							
								
								
								Update dependencies and bundle SQLite with the program, so we have one less dependency to install separately  
							
							
							
						 
						
							2018-05-07 21:33:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	7e7c3681da  
						 
						
							
							
								
								
								Implemented public key method correctly, which fixes decryption errors in collections and organizations  
							
							
							
						 
						
							2018-05-04 22:54:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	79b4ddcae8  
						 
						
							
							
								
								
								Added read_only bit to users_collections  
							
							
							
						 
						
							2018-05-04 20:10:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	0cb58add54  
						 
						
							
							
								
								
								Implemented some admin methods, inserted CollectionsUsers only when Org accessAll == false, and implemented find_collection when user has access_all in Org  
							
							
							
						 
						
							2018-05-04 19:47:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	92236394e6  
						 
						
							
							
								
								
								Delete folder mappings when deleting folders and make sure that we can't change a ciphers owner when created  
							
							
							
						 
						
							2018-05-04 19:02:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	85bc5514f8 
 
						 
						
							
							
								
								
								Merge pull request  #12  from mprasil/user_decoupling  
							
							... 
							
							
							
							Decoupling user from cipher 
							
						 
						
							2018-05-04 16:27:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	c4360ee697  
						 
						
							
							
								
								
								Save extra query when checking write access  
							
							
							
						 
						
							2018-05-04 13:42:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	a0796acbc7  
						 
						
							
							
								
								
								Implement suggested improvements  
							
							
							
						 
						
							2018-05-03 17:47:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	c3be1b4298  
						 
						
							
							
								
								
								Fix FolderCipher creation, handle some errors  
							
							
							
						 
						
							2018-05-01 16:54:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	514a372bc8  
						 
						
							
							
								
								
								Add per-user folder-cipher mapping  
							
							
							
						 
						
							2018-04-30 23:38:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	f578019df6  
						 
						
							
							
								
								
								Can now remove notes and fields correctly. Also fixed fields, that should go in uppercase  
							
							
							
						 
						
							2018-04-27 18:12:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	0037f0819b 
 
						 
						
							
							
								
								
								Merge pull request  #11  from mprasil/save_name  
							
							... 
							
							
							
							Save the name when updating the cipher data 
							
						 
						
							2018-04-27 16:35:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	787172116d  
						 
						
							
							
								
								
								Save the name when updating the cipher data  
							
							
							
						 
						
							2018-04-27 15:27:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	da47846f22 
 
						 
						
							
							
								
								
								Merge pull request  #9  from mprasil/org_cipher  
							
							... 
							
							
							
							Add support for adding and viewing of org ciphers 
							
						 
						
							2018-04-27 13:58:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	7e9e200d29  
						 
						
							
							
								
								
								Add support for adding and viewing of org ciphers  
							
							
							
						 
						
							2018-04-27 12:49:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	9c46d2f72d 
 
						 
						
							
							
								
								
								Merge pull request  #8  from mprasil/master  
							
							... 
							
							
							
							Move settings out of web-vault 
							
						 
						
							2018-04-27 01:12:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	f00732ddc5  
						 
						
							
							
								
								
								Move settings out of web-vault  
							
							
							
						 
						
							2018-04-26 23:40:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	69e624f82b  
						 
						
							
							
								
								
								Improved collection loading  
							
							
							
						 
						
							2018-04-26 23:21:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	68a4230200 
 
						 
						
							
							
								
								
								Merge pull request  #7  from mprasil/org  
							
							... 
							
							
							
							Adding some oganization features - mostly collections 
							
						 
						
							2018-04-26 22:58:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	c5185ddb83  
						 
						
							
							
								
								
								Adding some oganization features  
							
							
							
						 
						
							2018-04-26 17:19:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	5210f9b951  
						 
						
							
							
								
								
								Added org user editing  
							
							
							
						 
						
							2018-04-25 00:34:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	e6132809d2  
						 
						
							
							
								
								
								Implemented delete user from org and added checks to the already existing org methods  
							
							
							
						 
						
							2018-04-24 23:04:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	3d454f36bc  
						 
						
							
							
								
								
								Removed included web vault.  
							
							... 
							
							
							
							Now that docker automatically downloads the web-vault, keeping it in the repo doesn't make sense.
Added error message in case someone tries to run the application directly without the web-vault instaled.. 
							
						 
						
							2018-04-24 22:41:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	4093bf92fe  
						 
						
							
							
								
								
								Initial organizations functionality: Creating orgs and inviting users  
							
							
							
						 
						
							2018-04-24 22:01:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	a4d2aad331  
						 
						
							
							
								
								
								Removed unused proxy functionality  
							
							
							
						 
						
							2018-04-24 20:53:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	3a1321a5a9  
						 
						
							
							
								
								
								Updated some dependencies and removed old unused attribute that might create compile errors  
							
							
							
						 
						
							2018-04-24 15:49:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	96e20a66a0  
						 
						
							
							
								
								
								Removed some duplicated code in the delete cipher functions  
							
							
							
						 
						
							2018-04-19 18:57:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	e6b6d7f3a0  
						 
						
							
							
								
								
								Allow no folder when editing cipher  
							
							
							
						 
						
							2018-04-19 17:54:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	328cbade19 
 
						 
						
							
							
								
								
								Merge pull request  #3  from mprasil/update-multi  
							
							... 
							
							
							
							Add bulk move and bulk delete 
							
						 
						
							2018-04-19 17:28:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	a7eb77ac90  
						 
						
							
							
								
								
								Add bulk move and bulk delete  
							
							
							
						 
						
							2018-04-19 15:32:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	8a0eac8030 
 
						 
						
							
							
								
								
								Merge pull request  #2  from mprasil/upstream-vault  
							
							... 
							
							
							
							Fetch Vault from upstream when building Docker image 
							
						 
						
							2018-04-18 15:58:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	818b511267  
						 
						
							
							
								
								
								Fetch Vault from upstream when building Docker image  
							
							
							
						 
						
							2018-04-18 12:55:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	b4a42054f9  
						 
						
							
							
								
								
								Updated dependencies and removed deprecated Diesel feature  
							
							
							
						 
						
							2018-04-18 12:17:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	
	
	25b63d3e6b 
 
						 
						
							
							
								
								
								Merge pull request  #1  from mprasil/master  
							
							... 
							
							
							
							Bump the rocket version to compile with current nightly 
							
						 
						
							2018-04-18 12:08:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Prasil 
								
							 
						 
						
							
							
								
							
							
	49d080a97e  
						 
						
							
							
								
								
								Bump the rocket version to compile with current nightly  
							
							
							
						 
						
							2018-04-18 10:40:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	b1749da9be  
						 
						
							
							
								
								
								Fixed cipher API response to always uppercase first letter of JSON object keys  
							
							
							
						 
						
							2018-03-21 01:07:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	3b2b4d8382  
						 
						
							
							
								
								
								Updated web vault  
							
							
							
						 
						
							2018-03-21 01:05:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	9116253ae5  
						 
						
							
							
								
								
								Updated dependencies  
							
							
							
						 
						
							2018-03-21 00:08:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	66097e5f12  
						 
						
							
							
								
								
								r2d2_diesel is included in diesel since 1.1, so we don't need the dependencies directly.  
							
							... 
							
							
							
							Same thing with time, included in chrono 
							
						 
						
							2018-03-07 18:41:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	1277cb099d  
						 
						
							
							
								
								
								Updated Cipher API with breaking changes, and included backwards compatibility  
							
							
							
						 
						
							2018-03-06 20:34:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	e2f7f56a81  
						 
						
							
							
								
								
								Removed unused test library that broke with latest nightly, and updated dependencies  
							
							
							
						 
						
							2018-03-01 14:36:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	dfefbf1f31  
						 
						
							
							
								
								
								Fixed cipher import, created missing data structs instead of using generic Value, and fixed some warnings  
							
							
							
						 
						
							2018-02-23 00:38:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	c8b45f5fe5  
						 
						
							
							
								
								
								Added equivalent domains to /api/sync  
							
							
							
						 
						
							2018-02-20 14:09:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	e9a771057e  
						 
						
							
							
								
								
								Reduced Docker final image and updated dependencies  
							
							
							
						 
						
							2018-02-18 19:14:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	e173ef948d  
						 
						
							
							
								
								
								Removed some unnecesary clones  
							
							
							
						 
						
							2018-02-17 23:38:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	4c9d82d790  
						 
						
							
							
								
								
								Equivalent domains  
							
							
							
						 
						
							2018-02-17 23:21:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	1bc346688c  
						 
						
							
							
								
								
								Some initial work on organizations, nothing works yet  
							
							
							
						 
						
							2018-02-17 23:04:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel García 
								
							 
						 
						
							
							
								
							
							
	d6a1a9b274  
						 
						
							
							
								
								
								Detect device type correctly and shorten return types of functions  
							
							
							
						 
						
							2018-02-17 22:28:15 +01:00