Daniel García and GitHub
af50eae604
Merge pull request #2586 from jjlin/password-hint-config
...
Add `password_hints_allowed` config option
2022-07-01 16:31:56 +02:00
Daniel García
60b339f450
Update included web vault to v2022.5.2
2022-06-26 22:04:45 +02:00
Daniel García
f71c779860
Merge branch 'BlackDex-log-level-adjustment' into main
2022-06-26 21:54:54 +02:00
Daniel García
221a11de9b
Merge branch 'log-level-adjustment' of https://github.com/BlackDex/vaultwarden into BlackDex-log-level-adjustment
2022-06-26 21:54:48 +02:00
Daniel García
794483c10d
Merge branch 'BlackDex-fix-issue-2570' into main
2022-06-26 21:54:27 +02:00
Daniel García
c9934ccdb7
Merge branch 'fix-issue-2570' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-issue-2570
2022-06-26 21:54:22 +02:00
Daniel García
54729f3c1e
Merge branch 'BlackDex-optimize-icon-html-parsing' into main
2022-06-26 21:54:10 +02:00
Daniel García
f1a86acb98
Merge branch 'optimize-icon-html-parsing' of https://github.com/BlackDex/vaultwarden into BlackDex-optimize-icon-html-parsing
2022-06-26 21:54:03 +02:00
Daniel García
6b6ea3c8bf
Merge branch 'BlackDex-fix-issue-2566' into main
2022-06-26 21:53:06 +02:00
Daniel García
bf403fee7d
Merge branch 'fix-issue-2566' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-issue-2566
2022-06-26 21:52:59 +02:00
Daniel García
5cd920cf6f
Merge branch 'BlackDex-allow-firefox-relay' into main
2022-06-26 21:51:50 +02:00
Daniel García and GitHub
887e320e7f
Merge pull request #2555 from jjlin/global-domains
...
Sync global_domains.json
2022-06-15 20:44:35 +02:00
Daniel García and GitHub
d7c18fd86e
Merge pull request #2556 from binlab/patch-1
...
A little depreciation change
2022-06-15 20:44:14 +02:00
Daniel García and GitHub
7566f3db3e
Merge pull request #2543 from BlackDex/update-and-fixes
...
Updated deps and misc fixes and updates
2022-06-15 20:43:26 +02:00
Daniel García
f95bd3bb04
Update pico-args
2022-06-04 19:16:36 +02:00
Daniel García
b00fbf153e
Fix clippy lint and remove unused log
2022-06-04 19:13:58 +02:00
Daniel García
0de5919a16
Fix incorrect pings sent, and respond to pings from the client
2022-06-04 19:13:58 +02:00
Daniel García
699777be9e
use dashmap in icons blacklist regex
2022-06-04 19:13:58 +02:00
Daniel García
16ff49d712
Move to job_scheduler_ng
2022-06-04 19:13:57 +02:00
Daniel García
54c78cf06d
Migrate old ws crate to tungstenite, which is async and also removes over 20 old dependencies
2022-06-04 19:13:39 +02:00
Daniel García
303eaabeea
Merge branch 'paolobarbolini-lettre-improvements' into main
2022-06-04 19:13:12 +02:00
Daniel García
6b6f5b8d04
Merge branch 'lettre-improvements' of https://github.com/paolobarbolini/vaultwarden into paolobarbolini-lettre-improvements
2022-06-04 19:10:51 +02:00
Daniel García
0c18a7e306
Merge branch 'paolobarbolini-lettre-rc7' into main
2022-06-04 19:09:11 +02:00
Daniel García
a23a38080b
Merge branch 'lettre-rc7' of https://github.com/paolobarbolini/vaultwarden into paolobarbolini-lettre-rc7
2022-06-04 19:09:03 +02:00
Daniel García
316ca66a4b
Merge branch 'Lowaiz-add_disabled_member_to_json_user' into main
2022-06-04 19:08:23 +02:00
Daniel García
2f71a01877
Merge branch 'add_disabled_member_to_json_user' of https://github.com/Lowaiz/vaultwarden into Lowaiz-add_disabled_member_to_json_user
2022-06-04 19:08:15 +02:00
Daniel García
d5cfbfc71d
Update web vault to v2022.05.0
2022-06-04 19:07:15 +02:00
Daniel García and GitHub
3713f2d134
Merge pull request #2507 from BlackDex/fix-persisten-volume-check
...
Fix persistent volume check
2022-05-28 14:56:47 +02:00
Daniel García and GitHub
5845ed2c92
Merge pull request #2501 from BlackDex/add-persistent-volume-check-docker
...
Add a persistent volume check.
2022-05-27 19:41:42 +02:00
Daniel García and GitHub
bf0b8d9968
Merge pull request #2491 from BlackDex/issue-2490
...
Fix armv6 issue with bullseye images
2022-05-24 15:46:34 +02:00
Daniel García and GitHub
d0a7437dbd
Merge pull request #2489 from fox34/update-env-template
...
Add TMP_FOLDER to .env.template
2022-05-24 15:33:22 +02:00
Daniel García
0d3daa9fc6
Remove recommendation to set ROCKET_CLI_COLORS to off
...
The value is now a boolean so setting it to off will cause an error
2022-05-23 20:19:29 +02:00
Daniel García
0c1f0bad17
Merge branch 'BlackDex-update-rust-version-dockerfile' into main
2022-05-21 19:17:29 +02:00
Daniel García
72cf59fa54
Merge branch 'update-rust-version-dockerfile' of https://github.com/BlackDex/vaultwarden into BlackDex-update-rust-version-dockerfile
2022-05-21 19:17:24 +02:00
Daniel García
527bc1f625
Merge branch 'BlackDex-fix-upload-limits-and-logging' into main
2022-05-21 19:17:15 +02:00
Daniel García
b636d20c64
Update web vault to v2.28.1
2022-05-11 22:19:22 +02:00
Daniel García
2a9ca88c2a
Dependency updates
2022-05-11 22:03:07 +02:00
Daniel García
b9c434addb
Merge branch 'jjlin-db-conn-init' into main
2022-05-11 21:36:11 +02:00
Daniel García
451ad47327
Merge branch 'db-conn-init' of https://github.com/jjlin/vaultwarden into jjlin-db-conn-init
2022-05-11 21:36:00 +02:00
Daniel García
7f61dd5fe3
Merge branch 'BlackDex-sql-optimizations' into main
2022-05-11 21:33:43 +02:00
Daniel García and GitHub
3abf173d89
Merge pull request #2433 from jjlin/meta-apis
...
Add `/api/{alive,now,version}` endpoints
2022-04-24 18:36:08 +02:00
Daniel García
26ad06df7c
Update web vault to 2.28.0 and dependencies
2022-04-23 18:18:15 +02:00
Daniel García and GitHub
37fff3ef4a
Merge pull request #2400 from jjlin/global-domains
...
Sync global_domains.json
2022-03-30 22:02:44 +02:00
Daniel García and GitHub
a07c213b3e
Merge pull request #2398 from BlackDex/remove-u2f
...
Remove u2f implementation
2022-03-27 18:43:09 +02:00
Daniel García and GitHub
ed72741f48
Merge pull request #2397 from BlackDex/fix-mimalloc-build
...
Fix building mimalloc on armv6
2022-03-27 18:42:59 +02:00
Daniel García
6643e83b61
Disable mimalloc in arm for now
2022-03-26 20:11:46 +01:00
Daniel García
7b742009a1
Update web vault to 2.27.0 and dependencies
2022-03-26 16:35:54 +01:00
Daniel García
649e2b48f3
Merge branch 'Wonderfall-x-xss-protection' into main
2022-03-26 16:18:48 +01:00
Daniel García
81f0c2b0e8
Merge branch 'x-xss-protection' of https://github.com/Wonderfall/vaultwarden into Wonderfall-x-xss-protection
2022-03-26 16:18:34 +01:00
Daniel García
80d8aa7239
Merge branch 'BlackDex-misc-updates-202203' into main
2022-03-26 16:18:24 +01:00
Daniel García and GitHub
8d06d9c111
Merge pull request #2354 from BlackDex/multi-account-login
...
Update login API code and update crates to fix CVE
2022-03-13 15:46:49 +01:00
Daniel García
06f8e69c70
Update web vault to 2.26.1
2022-02-27 22:21:36 +01:00
Daniel García
7db52374cd
Merge branch 'BlackDex-async-updates' into async
2022-02-27 21:51:19 +01:00
Daniel García
843f205f6f
Merge branch 'async-updates' of https://github.com/BlackDex/vaultwarden into BlackDex-async-updates
2022-02-27 21:50:33 +01:00
Daniel García
2ff51ae77e
formatting
2022-02-27 21:37:24 +01:00
Daniel García
2b75d81a8b
Ignore unused field
2022-02-27 21:37:24 +01:00
Daniel García
cad0dcbed1
await the mutex in db_run and use block_in_place for it's contents
2022-02-27 21:37:24 +01:00
Daniel García
0b7d6bf6df
Update to rocket 0.5 and made code async, missing updating all db calls, that are currently blocking
2022-02-27 21:36:31 +01:00
Daniel García
89fe05b6cc
Merge branch 'taylorwmj-main' into main
2022-02-27 21:22:24 +01:00
Daniel García
d73d74e78f
Merge branch 'main' of https://github.com/taylorwmj/vaultwarden into taylorwmj-main
2022-02-27 21:22:15 +01:00
Daniel García
9a682b7a45
Merge branch 'TinfoilSubmarine-custom-env-path' into main
2022-02-27 21:21:46 +01:00
Daniel García
94201ca133
Merge branch 'custom-env-path' of https://github.com/TinfoilSubmarine/vaultwarden into TinfoilSubmarine-custom-env-path
2022-02-27 21:21:38 +01:00
Daniel García
99f9e7252a
Merge branch 'jaen-add-ip-to-send-unauthorized-message' into main
2022-02-27 21:19:21 +01:00
Daniel García
d781981bbd
formatting
2022-01-30 22:26:19 +01:00
Daniel García
5125fdb882
Ignore unused field
2022-01-30 22:26:19 +01:00
Daniel García
fd9693b961
await the mutex in db_run and use block_in_place for it's contents
2022-01-30 22:26:19 +01:00
Daniel García
2d5f172e77
Update to rocket 0.5 and made code async, missing updating all db calls, that are currently blocking
2022-01-30 22:25:54 +01:00
Daniel García
08f0de7b46
Dependency updates
2022-01-30 22:24:42 +01:00
Daniel García
45122bed9e
Update web vault to v2.25.1b
2022-01-30 21:33:13 +01:00
Daniel García and GitHub
0876d4a5fd
Merge pull request #2257 from jjlin/email-token
...
Increase length limit for email token generation
2022-01-29 00:05:38 +01:00
Daniel García
9a60eb04c2
Update web vault to 2.25.1 and rust base images to march rust-toolchain, the official rust images don't have nightly builds, so just use the latest
2022-01-24 00:15:25 +01:00
Daniel García
1b99da91fb
Merge branch 'dscottboggs-fix/CVE-2022-21658' into main
2022-01-24 00:03:52 +01:00
Daniel García
a64a400c9c
Merge branch 'fix/CVE-2022-21658' of https://github.com/dscottboggs/vaultwarden into dscottboggs-fix/CVE-2022-21658
2022-01-24 00:03:46 +01:00
Daniel García
19e78e3509
Merge branch 'jjlin-api-key' into main
2022-01-23 23:50:42 +01:00
Daniel García
bf6330374c
Merge branch 'api-key' of https://github.com/jjlin/vaultwarden into jjlin-api-key
2022-01-23 23:50:34 +01:00
Daniel García
e639d9063b
Merge branch 'iamdoubz-iamdoubz-feature-to-permissions-policy-patch' into main
2022-01-23 23:44:17 +01:00
Daniel García
4a88e7ec78
Merge branch 'iamdoubz-feature-to-permissions-policy-patch' of https://github.com/iamdoubz/vaultwarden into iamdoubz-iamdoubz-feature-to-permissions-policy-patch
2022-01-23 23:44:08 +01:00
Daniel García
65dad5a9d1
Merge branch 'jjlin-icons' into main
2022-01-23 23:43:30 +01:00
Daniel García
ba9ad14fbb
Merge branch 'icons' of https://github.com/jjlin/vaultwarden into jjlin-icons
2022-01-23 23:43:24 +01:00
Daniel García
62c7a4d491
Merge branch 'BlackDex-fix-emergency-invite-register' into main
2022-01-23 23:42:42 +01:00
Daniel García
14e3dcad8e
Merge branch 'fix-emergency-invite-register' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-emergency-invite-register
2022-01-23 23:42:35 +01:00
Daniel García
f4a9645b54
Remove references to "bwrs" #2195
...
Squashed commit of the following:
commit 1bdf1c7954e0731c95703d10118f3874ab5155d3
Merge: 8ba6e61 7257251
Author: Daniel García <dani-garcia@users.noreply.github.com >
Date: Sun Jan 23 23:40:17 2022 +0100
Merge branch 'remove-bwrs' of https://github.com/RealOrangeOne/vaultwarden into RealOrangeOne-remove-bwrs
commit 7257251ecf
Author: Jake Howard <git@theorangeone.net >
Date: Thu Jan 6 17:48:18 2022 +0000
Use `or_else` to save potentially unnecessary function call
commit 40ae81dd3c
Author: Jake Howard <git@theorangeone.net >
Date: Wed Jan 5 21:18:24 2022 +0000
Move $BWRS_VERSION fallback into build.rs
commit 743ef74b30
Author: Jake Howard <git@theorangeone.net >
Date: Sat Jan 1 23:08:27 2022 +0000
Revert "Add feature to enable use of `Option::or` in const context"
This reverts commit fe8e043b8a .
We want to run on stable soon, where these features are not supported
commit a1f0da638c
Author: Jake Howard <git@theorangeone.net >
Date: Sat Jan 1 13:04:47 2022 +0000
Rename web vault version file
https://github.com/dani-garcia/bw_web_builds/pull/58
commit fe8e043b8a
Author: Jake Howard <git@theorangeone.net >
Date: Sat Jan 1 12:56:44 2022 +0000
Add feature to enable use of `Option::or` in const context
commit 687435c8b2
Author: Jake Howard <git@theorangeone.net >
Date: Sat Jan 1 12:27:28 2022 +0000
Continue to allow using `$BWRS_VERSION`
commit 8e2f708e50
Author: Jake Howard <git@theorangeone.net >
Date: Fri Dec 31 11:41:34 2021 +0000
Remove references to "bwrs"
The only remaining one is getting the version of the web vault, which requires coordinating with the web vault patching.
2022-01-23 23:40:59 +01:00
Daniel García and GitHub
8ba6e61fd5
Merge pull request #2197 from BlackDex/issue-2196
...
Fix issue with Bitwarden CLI.
2022-01-02 23:47:40 +01:00
Daniel García and GitHub
a30a1c9703
Merge pull request #2194 from BlackDex/issue-2154
...
Fixed issue #2154
2022-01-02 23:46:32 +01:00
Daniel García and GitHub
76687e2df7
Merge pull request #2188 from jjlin/icons
...
Add config option to set the HTTP redirect code for external icons
2022-01-02 23:46:23 +01:00
Daniel García and GitHub
920371929b
Merge pull request #2182 from RealOrangeOne/cache-expires-header
...
Set `Expires` header when caching responses
2021-12-30 01:38:39 +01:00
Daniel García
cc646b1519
Merge branch 'BlackDex-multi-db-dockers' into main
2021-12-27 21:55:36 +01:00
Daniel García
e501dc6d0e
Merge branch 'multi-db-dockers' of https://github.com/BlackDex/vaultwarden into BlackDex-multi-db-dockers
2021-12-27 21:55:28 +01:00
Daniel García
85ac9783f0
Merge branch 'ratelimit' into main
2021-12-27 21:55:15 +01:00
Daniel García
d4eb21c2d9
Better document the new rate limiting
2021-12-25 01:12:09 +01:00
Daniel García and GitHub
6bf8a9d93d
Merge pull request #2171 from jjlin/global-domains
...
Sync global_domains.json
2021-12-25 00:55:50 +01:00
Daniel García and GitHub
b89ffb2731
Merge pull request #2170 from BlackDex/issue-2136
...
Small changes to icon log messages.
2021-12-24 20:40:30 +01:00
Daniel García and GitHub
bda123b1eb
Merge pull request #2169 from BlackDex/issue-2151
...
Fixed #2151
2021-12-24 20:40:07 +01:00
Daniel García
5529264c3f
Basic ratelimit for user login (including 2FA) and admin login
2021-12-22 21:48:49 +01:00
Daniel García and GitHub
0a5df06e77
Merge pull request #2158 from jjlin/icons
...
Add support for external icon services
2021-12-22 15:46:30 +01:00
Daniel García and GitHub
840cf8740a
Merge pull request #2156 from jjlin/global-domains
...
Sync global_domains.json
2021-12-19 17:39:45 +01:00
Daniel García
9e4d372213
Update web vault to 2.25.0
2021-12-13 00:02:13 +01:00
Daniel García and GitHub
d0bf0ab237
Merge pull request #2125 from BlackDex/trust-dns
...
Enabled trust-dns and some updates.
2021-12-08 00:26:31 +01:00
Daniel García and GitHub
ead2f02cbd
Merge pull request #2084 from BlackDex/minimize-macro-recursion
...
Macro recursion decrease and other optimizations
2021-11-06 22:00:37 +01:00
Daniel García and GitHub
6ae48aa8c2
Merge pull request #2080 from jjlin/fix-postgres-migration
...
Fix PostgreSQL migration
2021-11-01 14:33:47 +01:00