1040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel García	bbe2a1b264	Merge pull request #391 from TheMardy/master ... Updated Email Templates	2019-02-10 22:03:20 +01:00
Daniel García	79fdfd6524	Add missing url parameter	2019-02-10 21:40:20 +01:00
Daniel García	d086a99e5b	Implemented HTML emails with text alternative	2019-02-10 19:12:34 +01:00
TheMardy	22b0b95209	Added HTML templates (+14 squashed commit) ... Squashed commit: [ece2260] Plaintext send_org_invite [01d4884] Plaintext pw_hint_some [6ce5173] Plaintext pw_hint_none [881af3e] Plaintext invite_confirmed [ce78621] Plaintext invite_accepted [13a44a4] Rename send_org_invite.hbs to send_org_invite.html.hbs [b52bf2f] Rename pw_hint_some.hbs to pw_hint_some.html.hbs [e0d1aeb] Rename pw_hint_none.hbs to pw_hint_none.html.hbs [898dbcd] Rename invite_confirmed.hbs to invite_confirmed.html.hbs [107af31] Rename invite_accepted.hbs to invite_accepted.html.hbs [d26d662] Updated send_org_invite template [71f47af] Updated pw_hint_some template [c2ca3c2] Updated pw_hint_none template [50f8bfb] Updated invite_accepted template [17f96f8] Updated invite_confirmed template	2019-02-10 19:04:18 +01:00
Daniel García	28d1588e73	Show version in admin panel	2019-02-10 16:02:46 +01:00
Daniel García	f3b1a5ff3e	Error when admin panel is disabled	2019-02-10 15:26:19 +01:00
Daniel García	330e90a6ac	Hide secrets in config panel	2019-02-08 20:49:04 +01:00
Daniel García	8fac72db53	Mention relation between DOMAIN and mail settings in .env template	2019-02-08 19:21:48 +01:00
Daniel García	820c8b0dce	Change use of deserialize_with for Option iterator	2019-02-08 19:12:08 +01:00
Daniel García	8b4a6f2a64	Fixed some clippy lints and changed update_uuid_revision to only use one db query	2019-02-08 18:45:07 +01:00
Daniel García	ef63342e20	Add reset user config button	2019-02-06 17:34:32 +01:00
Daniel García	89840790e7	Fix .env path traversal issue	2019-02-06 17:34:31 +01:00
Daniel García	a72809b225	Yubico and SMTP enable/disable master switches	2019-02-06 17:34:31 +01:00
Daniel García	9976e4736e	Add groups	2019-02-06 17:34:31 +01:00
Daniel García	dc92f07232	Added env variable to select config file. Initial work towards groups and added tooltips with descriptions and nicer names	2019-02-06 17:34:30 +01:00
Daniel García	3db815b969	Implemented config form and fixed config priority	2019-02-06 17:34:30 +01:00
Daniel García	ade293cf52	Save config	2019-02-06 17:34:29 +01:00
Daniel García	877408b808	Implement basic config loading and updating. No save to file yet.	2019-02-06 17:34:29 +01:00
Daniel García	86ed75bf7c	Config can now be serialized / deserialized	2019-02-06 17:34:29 +01:00
Daniel García	20d8d800f3	Updated dependencies	2019-02-06 17:34:29 +01:00
Daniel García	7ce06b3808	Merge pull request #387 from mprasil/collections_edit_revision ... Update revision when adding or removing cipher from collection	2019-02-06 17:33:03 +01:00
Miroslav Prasil	08ca47cadb	Update revision when adding or removing cipher from collection	2019-02-06 14:47:47 +00:00
Daniel García	0bd3a26051	Merge pull request #386 from mprasil/revision_collection_delete ... Update revision of affected users when deleting Collection	2019-02-06 14:53:16 +01:00
Miroslav Prasil	5272b465cc	Update revision of affected users when deleting Collection	2019-02-06 13:39:32 +00:00
Daniel García	b75f38033b	Merge pull request #385 from mprasil/update_revision_retry ... Retry updating revision - fixes #383	2019-02-05 15:31:07 +01:00
Miroslav Prasil	637f655b6f	Do not allocate uneccessary Vec	2019-02-05 14:16:07 +00:00
Miroslav Prasil	b3f7394c06	Do not update revision at the end, as we already did that	2019-02-05 14:09:59 +00:00
Miroslav Prasil	1a5ecd4d4a	cipher does not need to be mutable	2019-02-05 13:52:30 +00:00
Miroslav Prasil	bd65c4e312	Remove superfluous cipher.save() call	2019-02-05 13:49:30 +00:00
Miroslav Prasil	bce656c787	Retry updating revision - fixes #383	2019-02-05 11:52:11 +00:00
Daniel García	06522c9ac0	Merge pull request #382 from BlackDex/iter-iconlist ... Loop through the iconlist until an icon is found	2019-02-04 18:54:15 +01:00
BlackDex	9026cc8d42	Fixed issue when the iconlist is smaller then 5 ... When the iconlist was smaller then 5 items, it would cause a panic. Solved by using .truncate() on the iconlist.	2019-02-04 17:27:40 +01:00
BlackDex	574b040142	Loop through the iconlist until an icon is found ... Loop for a maximum of 5 times through the iconlist or until a successful download of an icon.	2019-02-04 16:59:52 +01:00
Daniel García	48113b7bd9	Merge pull request #381 from BlackDex/issue-380 ... Fixed issue #380	2019-02-04 13:56:11 +01:00
BlackDex	c13f115473	Fixed issue #380 ... - Created a separate function for parsing the sizes attribute - Parsing sizes now with regex - Should work with any non-digit separator	2019-02-04 12:55:39 +01:00
Daniel García	1e20f9f1d8	Merge pull request #377 from BlackDex/icon-cookies ... Added cookies to the icon download request.	2019-01-31 18:16:30 +01:00
BlackDex	bc461d9baa	Some small changes on the iter of the cookies	2019-01-31 17:58:03 +01:00
BlackDex	5016e30cf2	Added cookies to the icon download request. ... Some sites use XSRF Tokens, or other Tokens to verify a subseqense response. The cookies which are sent during the page request are now used when downloading the favicon. A site which uses this is mijn.ing.nl.	2019-01-31 15:49:58 +01:00
Daniel García	f42ac5f2c0	Update web vault error message	2019-01-29 21:45:25 +01:00
Daniel García	2a60414031	Reuse the client between requests, and use the client when downloading the icons themselves	2019-01-29 21:21:26 +01:00
Daniel García	9a2a304860	Merge pull request #372 from BlackDex/better-href-fix ... Changed the way to fix the href	2019-01-29 19:30:53 +01:00
BlackDex	feb74a5e86	Changed the way to fix the href ... - Using url from reqwest to fix href, this fixes: + "//domain.com/icon.png" + "relative/path/to/icon.png" + "/absolute/path/to/icon.png" - Removed fix_href function - Some variable changes	2019-01-29 18:08:23 +01:00
Daniel García	c0e350b734	Disable icon downloads, accept optional query after icon href, format and clippy fixes	2019-01-28 23:58:32 +01:00
Daniel García	bef1183c49	Only send one notification per vault import and purge, improve move ciphers functions	2019-01-28 00:39:14 +01:00
Daniel García	f935f5cf46	Remove local icon extractor	2019-01-27 16:42:30 +01:00
Daniel García	07388d327f	Merge pull request #370 from BlackDex/favicons ... Added better favicon downloader.	2019-01-27 16:37:47 +01:00
BlackDex	4de16b2d17	Removed unwrap and added ?	2019-01-27 16:25:02 +01:00
BlackDex	da068a43c1	Moved function call to get_icon_url to prevent error bubbeling	2019-01-27 16:03:18 +01:00
BlackDex	9657463717	Added better favicon downloader.	2019-01-27 15:39:19 +01:00
Daniel García	69036cc6a4	Add disabled user badge (no password) and deauthorize button to admin page.	2019-01-26 19:28:54 +01:00