Commit Graph

2668 Commits

Author SHA1 Message Date
fb4e6bab14 Clean up the share_collection handling 2018-10-01 15:59:10 +01:00
fe38f95f15 Add dockerfile for aarch64 (arm64) 2018-09-28 13:01:47 +01:00
9eaa9c1a17 Add WEBSOCKET_ADDRESS config option (Fixes #199) 2018-09-28 13:50:04 +02:00
8ee681c4a3 Merge pull request #200 from mprasil/copy_fix
Remove unecessary copy from armv7 Dockerfile
2018-09-28 13:31:40 +02:00
08aee97c1d Remove unecessary copy from armv7 Dockerfile 2018-09-28 09:49:10 +01:00
2bb6482bec Merge branch 'openssl-fix' 1.2.0 2018-09-20 22:52:58 +02:00
c169095128 Update dependencies to point to upstream lettre 2018-09-20 22:45:19 +02:00
b1397c95ca Remove unnecessary path in PROXY.md 2018-09-19 22:33:12 +02:00
3df31e3464 Temp fix for OpenSSL 1.1.1 compatibility 2018-09-19 21:45:50 +02:00
638a0fd3c3 Updated dependencies 2018-09-19 21:43:03 +02:00
ebb66c374e Implement KDF iterations change (Fixes #195) 2018-09-19 17:30:14 +02:00
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
3da410ef71 Update Vault to v2.3.0 2018-09-18 13:53:25 +01:00
2dccbd3412 Merge pull request #190 from mprasil/invite_readme
Update the Invitation workflow documentation
2018-09-18 14:36:39 +02:00
2ff529ed99 Merge pull request #189 from mprasil/delete_fix
Add alias for DELETE call on accounts
2018-09-18 14:36:31 +02:00
4fae1e4298 Update the Invitation workflow documentation 2018-09-18 11:49:20 +01:00
f7951b44ba Add alias for DELETE call on accounts 2018-09-18 11:13:45 +01:00
ff8eeff995 Merge pull request #184 from mprasil/code_block_fix
Fixed code block, added some formatting
2018-09-16 15:44:05 +02:00
00019dc356 Added some formating and link 2018-09-16 12:36:08 +01:00
404fe5321e Fixed code block 2018-09-16 12:27:29 +01:00
e7dd239d20 Merge pull request #182 from dobunzli/master
Update README.md
2018-09-15 20:03:58 +02:00
071f3370e3 Merge pull request #183 from jkaberg/traefik_example_proxy
traefik proxy example
2018-09-15 20:03:34 +02:00
ee321be579 traefik example 2018-09-14 23:22:38 +02:00
eb61425da5 Update README.md
Added infos about enabling https when softwares getting certs are using symlinks
2018-09-14 22:39:58 +02:00
b75ba216d1 Return default prelogin values when the user doesn't exist 2018-09-13 23:04:52 +02:00
8651df8c2a Fixed some lint issues 2018-09-13 21:55:23 +02:00
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
9cdb605659 Include more proxy examples 2018-09-13 17:08:16 +02:00
928e2424c0 Updated dependencies and fixed errors 2018-09-13 16:05:13 +02:00
a01fee0b9f Merge branch 'ws'
# Conflicts:
#	Cargo.toml
#	src/api/core/ciphers.rs
#	src/main.rs
2018-09-13 15:59:45 +02:00
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
fdbd73c716 Merge branch 'master' into master 2018-09-13 15:39:28 +02:00
f397f0cbd0 Implement organization import for admins and owners (Fixes #178) 2018-09-13 15:16:24 +02:00
4d2c6e39b2 Merge pull request #177 from mprasil/raspberry
Add Dockerfile for Raspberry Pi
2018-09-13 00:19:15 +02:00
3e1afb139c Remove unnecessary return 2018-09-12 23:58:02 +02:00
af69606bea Documentation for SMTP and password hint configuration 2018-09-12 21:19:29 +02:00
bc8ff14695 Fix the binary path 2018-09-12 13:51:43 +01:00
5f7b220eb4 Initial shot as cross compilation 2018-09-12 12:15:26 +01:00
67adfee5e5 Some documentation 2018-09-11 17:27:04 +02:00
d66d4fd87f Add error message when the proxy doesn't route websockets correctly 2018-09-11 17:09:33 +02:00
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
c1cd4d9a6b Modify User::new to be keyless and paswordless 2018-09-11 14:25:12 +01:00
b63693aefb Merge pull request #137 from stammw/master
SMTP implementation, along with password HINT email
2018-09-11 14:58:09 +02:00
ec05f14f5a Implement poor man's invitation via Organization invitation 2018-09-11 13:09:59 +01:00
37d88be2be return an error when email adress for password hint is not valid 2018-09-11 13:12:24 +02:00
1c641d7635 Special messages when user has no password hint 2018-09-11 13:04:34 +02:00
e2ab2f7306 Save None instead of empty password hint 2018-09-11 13:00:59 +02:00
434551e012 Merge pull request #171 from shauder/ws
Expose 3012 in docker build file for notifications
2018-09-04 21:18:16 +02:00
69dcbdd3b2 Merge branch 'master' into ws 2018-09-04 17:46:38 +02:00
8df6f79f19 Merge pull request #170 from mprasil/org-user-edit
Fix editing users in Organization
2018-09-04 17:32:16 +02:00