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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mprasil
							
						 
					 | 
					
						
						
							
						
						1f35ef2865
					 | 
					
						
						
							
							Merge pull request #209 from janost/resend-invitation-error-message
						
						
						
						
						
						
						
						Return proper error message for org reinvite 
						
						
							
						
					 | 
					
						2018-10-05 23:21:08 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						77ff9c91c5
					 | 
					
						
						
							
							Merge pull request #207 from mprasil/continuation_token
						
						
						
						
						
						
						
						Add continuation token when we return object list 
						
						
							
						
					 | 
					
						2018-10-01 19:31:11 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						015bd28cc2
					 | 
					
						
						
							
							Merge pull request #201 from mprasil/aarch64
						
						
						
						
						
						
						
						Add dockerfile for aarch64 (arm64) 
						
						
							
						
					 | 
					
						2018-10-01 17:40:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						990c83a037
					 | 
					
						
						
							
							Merge pull request #204 from mprasil/org_improvements
						
						
						
						
						
						
						
						Org improvements 
						
						
							
						
					 | 
					
						2018-10-01 17:40:14 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						fe38f95f15
					 | 
					
						
						
							
							Add dockerfile for aarch64 (arm64)
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-28 13:01:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						9eaa9c1a17
					 | 
					
						
						
							
							Add WEBSOCKET_ADDRESS config option (Fixes #199)
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-28 13:50:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						8ee681c4a3
					 | 
					
						
						
							
							Merge pull request #200 from mprasil/copy_fix
						
						
						
						
						
						
						
						Remove unecessary copy from armv7 Dockerfile 
						
						
							
						
					 | 
					
						2018-09-28 13:31:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						08aee97c1d
					 | 
					
						
						
							
							Remove unecessary copy from armv7 Dockerfile
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-28 09:49:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						2bb6482bec
					 | 
					
						
						
							
							Merge branch 'openssl-fix'
						
						
						
						
						
						
							
 1.2.0
						
					 | 
					
						2018-09-20 22:52:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						c169095128
					 | 
					
						
						
							
							Update dependencies to point to upstream lettre
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-20 22:45:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						b1397c95ca
					 | 
					
						
						
							
							Remove unnecessary path in PROXY.md
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-19 22:33:12 +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
							
						 
					 | 
					
						
						
							
						
						638a0fd3c3
					 | 
					
						
						
							
							Updated dependencies
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-19 21:43:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						ebb66c374e
					 | 
					
						
						
							
							Implement KDF iterations change (Fixes #195)
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-19 17:30:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						89e3c41043
					 | 
					
						
						
							
							Merge pull request #191 from mprasil/vault_2.3.0
						
						
						
						
						
						
						
						Update Vault to v2.3.0 
						
						
							
						
					 | 
					
						2018-09-18 16:03:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						3da410ef71
					 | 
					
						
						
							
							Update Vault to v2.3.0
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-18 13:53:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						2dccbd3412
					 | 
					
						
						
							
							Merge pull request #190 from mprasil/invite_readme
						
						
						
						
						
						
						
						Update the Invitation workflow documentation 
						
						
							
						
					 | 
					
						2018-09-18 14:36:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						2ff529ed99
					 | 
					
						
						
							
							Merge pull request #189 from mprasil/delete_fix
						
						
						
						
						
						
						
						Add alias for DELETE call on accounts 
						
						
							
						
					 | 
					
						2018-09-18 14:36:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						4fae1e4298
					 | 
					
						
						
							
							Update the Invitation workflow documentation
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-18 11:49:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						f7951b44ba
					 | 
					
						
						
							
							Add alias for DELETE call on accounts
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-18 11:13:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						ff8eeff995
					 | 
					
						
						
							
							Merge pull request #184 from mprasil/code_block_fix
						
						
						
						
						
						
						
						Fixed code block, added some formatting 
						
						
							
						
					 | 
					
						2018-09-16 15:44:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						00019dc356
					 | 
					
						
						
							
							Added some formating and link
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-16 12:36:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						404fe5321e
					 | 
					
						
						
							
							Fixed code block
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-16 12:27:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						e7dd239d20
					 | 
					
						
						
							
							Merge pull request #182 from dobunzli/master
						
						
						
						
						
						
						
						Update README.md 
						
						
							
						
					 | 
					
						2018-09-15 20:03:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						071f3370e3
					 | 
					
						
						
							
							Merge pull request #183 from jkaberg/traefik_example_proxy
						
						
						
						
						
						
						
						traefik proxy example 
						
						
							
						
					 | 
					
						2018-09-15 20:03:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joel Kåberg
							
						 
					 | 
					
						
						
							
						
						ee321be579
					 | 
					
						
						
							
							traefik example
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-14 23:22:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dobunzli
							
						 
					 | 
					
						
						
							
						
						eb61425da5
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
						
						Added infos about enabling https when softwares getting certs are using symlinks 
						
						
							
						
					 | 
					
						2018-09-14 22:39:58 +02: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
							
						 
					 | 
					
						
						
							
						
						9cdb605659
					 | 
					
						
						
							
							Include more proxy examples
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-13 17:08:16 +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
							
						 
					 | 
					
						
						
							
						
						924e4a17e5
					 | 
					
						
						
							
							Merge pull request #175 from stammw/master
						
						
						
						
						
						
						
						Documentation for SMTP and password hint configuration 
						
						
							
 1.1.0
						
					 | 
					
						2018-09-13 15:46:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						fdbd73c716
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-13 15:39:28 +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
							
						 
					 | 
					
						
						
							
						
						4d2c6e39b2
					 | 
					
						
						
							
							Merge pull request #177 from mprasil/raspberry
						
						
						
						
						
						
						
						Add Dockerfile for Raspberry Pi 
						
						
							
						
					 | 
					
						2018-09-13 00:19:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel García
							
						 
					 | 
					
						
						
							
						
						3e1afb139c
					 | 
					
						
						
							
							Remove unnecessary return
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-12 23:58:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-Christophe BEGUE
							
						 
					 | 
					
						
						
							
						
						af69606bea
					 | 
					
						
						
							
							Documentation for SMTP and password hint configuration
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-12 21:19:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miroslav Prasil
							
						 
					 | 
					
						
						
							
						
						bc8ff14695
					 | 
					
						
						
							
							Fix the binary path
						
						
						
						
						
						
							
						
					 | 
					
						2018-09-12 13:51:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |