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
Daniel García and GitHub
88643fd9d5
Merge pull request #2078 from jjlin/fix-ea-reject
...
Fix missing encrypted key after emergency access reject
2021-11-01 14:33:39 +01:00
Daniel García and GitHub
73e0002219
Merge pull request #2073 from jjlin/fix-access-logic
...
Fix conflict resolution logic for `read_only` and `hide_passwords` flags
2021-11-01 14:33:29 +01:00
Daniel García and GitHub
a2316ca091
Merge pull request #2067 from jjlin/incomplete-2fa
...
Add email notifications for incomplete 2FA logins
2021-10-28 18:00:03 +02:00
Daniel García
9f393cfd9d
Formatting
2021-10-27 23:00:26 +02:00
Daniel García
450c4d4d97
Update web vault to 2.24.1
2021-10-27 22:46:12 +02:00
Daniel García
75e62abed0
Move database_max_conns
2021-10-24 22:22:28 +02:00
Daniel García
97f9eb1320
Update dependencies
2021-10-24 21:50:26 +02:00
Daniel García
53cc8a65af
Add doc comments to the functions in Config, and remove some unneeded pubs
2021-10-23 20:47:05 +02:00
Daniel García and GitHub
f94ac6ca61
Merge pull request #2044 from jjlin/emergency-access-cleanup
...
Emergency Access cleanup
2021-10-19 20:14:29 +02:00
Daniel García
016fe2269e
Update dependencies
2021-10-18 22:14:29 +02:00
Daniel García
03c0a5e405
Update web vault image to v2.23.0c
2021-10-18 22:06:35 +02:00
Daniel García
cbbed79036
Merge branch 'domdomegg-domdomegg/2fa-check-accepted' into main
2021-10-18 21:13:57 +02:00
Daniel García
4af81ec50e
Merge branch 'domdomegg/2fa-check-accepted' of https://github.com/domdomegg/vaultwarden into domdomegg-domdomegg/2fa-check-accepted
2021-10-18 21:13:50 +02:00
Daniel García
a5ba67fef2
Merge branch 'BlackDex-alive-db-check' into main
2021-10-18 21:13:29 +02:00
Daniel García
44da9e6ca7
Merge branch 'BlackDex-update-openssl-amd64-alpine' into main
2021-10-08 22:29:19 +02:00
Daniel García
4c0c8f7432
Merge branch 'update-openssl-amd64-alpine' of https://github.com/BlackDex/vaultwarden into BlackDex-update-openssl-amd64-alpine
2021-10-08 22:29:13 +02:00
Daniel García
f67854c59c
Merge branch 'BlackDex-mail-errors' into main
2021-10-08 22:28:54 +02:00
Daniel García
a1c1b9ab3b
Merge branch 'mail-errors' of https://github.com/BlackDex/vaultwarden into BlackDex-mail-errors
2021-10-08 22:28:46 +02:00
Daniel García
395979e834
Merge branch 'domdomegg-domdomegg/single-organization-policy' into main
2021-10-08 22:27:31 +02:00
Daniel García and GitHub
9930a0d752
Merge pull request #2001 from BlackDex/issue-1998
...
Revert Debian images back to Buster.
2021-09-27 19:59:59 +02:00
Daniel García
a6e0ddcdf1
Merge branch 'domdomegg-domdomegg/support-no-data-org-policies' into main
2021-09-26 23:21:30 +02:00
Daniel García
acab70ed89
Merge branch 'domdomegg/support-no-data-org-policies' of https://github.com/domdomegg/vaultwarden into domdomegg-domdomegg/support-no-data-org-policies
2021-09-26 23:21:24 +02:00
Daniel García
c0d149060f
Merge branch 'BlackDex-icon-download-update' into main
2021-09-26 23:20:55 +02:00
Daniel García
344f00d9c9
Merge branch 'icon-download-update' of https://github.com/BlackDex/vaultwarden into BlackDex-icon-download-update
2021-09-26 23:20:44 +02:00
Daniel García
b26afb970a
Merge branch 'Makishima-patch-1' into main
2021-09-26 23:19:36 +02:00
Daniel García
b4c95fb4ac
Hide some warnings for unused struct fields
2021-09-22 21:39:31 +02:00
Daniel García
0bb33e04bb
Update dependencies and ser cargo resolver to version 2 ahead of 2021 edition
2021-09-22 20:26:48 +02:00
Daniel García
4d33e24099
Update web vault to 2.23.0
2021-09-22 20:26:17 +02:00
Daniel García
2cdce04662
Merge branch 'thelittlefireman-emergency_feature' into main
2021-09-19 23:54:28 +02:00
Daniel García
756d108f6a
Merge branch 'emergency_feature' of https://github.com/thelittlefireman/bitwarden_rs into thelittlefireman-emergency_feature
2021-09-19 23:54:19 +02:00
Daniel García
4e8828e41a
Merge branch 'BlackDex-admin-interface' into main
2021-09-16 21:36:31 +02:00
Daniel García
f8d1cfad2a
Merge branch 'admin-interface' of https://github.com/BlackDex/vaultwarden into BlackDex-admin-interface
2021-09-16 21:36:25 +02:00
Daniel García
81741647f3
Merge branch 'BlackDex-bulk-org-actions' into main
2021-09-16 21:36:15 +02:00
Daniel García and GitHub
f7d99c43b5
Merge pull request #1973 from BlackDex/optimize-release
...
Optimize release workflow.
2021-09-13 20:39:48 +02:00
Daniel García
9e1550af8e
Merge branch 'BlackDex-issue-1963' into main
2021-09-09 20:30:38 +02:00
Daniel García
a99c9715f6
Merge branch 'issue-1963' of https://github.com/BlackDex/vaultwarden into BlackDex-issue-1963
2021-09-09 20:30:29 +02:00
Daniel García
1a888b5355
Merge branch 'jjlin-personal-ownership-imports' into main
2021-09-09 20:30:13 +02:00
Daniel García
d5ed2ce6df
Merge branch 'jjlin-webauthn-origin' into main
2021-09-06 17:17:04 +02:00
Daniel García
5e649f0d0d
Merge branch 'webauthn-origin' of https://github.com/jjlin/vaultwarden into jjlin-webauthn-origin
2021-09-06 17:16:56 +02:00
Daniel García
612c0e9478
Merge branch 'jjlin-bullseye' into main
2021-09-06 17:16:36 +02:00
Daniel García and GitHub
0d2b3bfb99
Merge pull request #1945 from BlackDex/github-actions-release
...
Build Docker Hub images via Github Actions
2021-09-08 20:54:41 +02:00
Daniel García
c934838ace
Merge branch 'bullseye' of https://github.com/jjlin/vaultwarden into jjlin-bullseye
2021-09-06 17:16:28 +02:00
Daniel García
a23f4a704b
Merge branch 'fabianthdev-fix/sends_notifications' into main
2021-08-22 22:17:00 +02:00
Daniel García
93f2f74767
Merge branch 'fix/sends_notifications' of https://github.com/fabianthdev/vaultwarden into fabianthdev-fix/sends_notifications
2021-08-22 22:16:50 +02:00
Daniel García
37ca202247
Merge branch 'mrckndt-fix-timezone-alpine-container' into main
2021-08-22 22:14:46 +02:00
Daniel García
37525b1e7e
Merge branch 'fix-timezone-alpine-container' of https://github.com/mrckndt/vaultwarden into mrckndt-fix-timezone-alpine-container
2021-08-22 22:14:38 +02:00
Daniel García
d594b5a266
Merge branch 'jjlin-fix-attachment-sharing' into main
2021-08-22 22:14:14 +02:00
Daniel García
41add45e67
Merge branch 'fix-attachment-sharing' of https://github.com/jjlin/vaultwarden into jjlin-fix-attachment-sharing
2021-08-22 22:14:07 +02:00
Daniel García
08b168a0a1
Merge branch 'BlackDex-fix-1878' into main
2021-08-22 22:12:59 +02:00
Daniel García
978ef2bc8b
Merge branch 'fix-1878' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-1878
2021-08-22 22:12:52 +02:00
Daniel García
1fe9f101be
Merge branch 'jjlin-fix-org-attachment-uploads' into main
2021-07-25 19:08:44 +02:00
Daniel García
c68fbb41d2
Merge branch 'fix-org-attachment-uploads' of https://github.com/jjlin/vaultwarden into jjlin-fix-org-attachment-uploads
2021-07-25 19:08:38 +02:00
Daniel García
2db30f918e
Merge branch 'BlackDex-fix-sync-desktop-client' into main
2021-07-25 19:07:59 +02:00
Daniel García
cfceac3909
Merge branch 'fix-sync-desktop-client' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-sync-desktop-client
2021-07-25 19:07:51 +02:00
Daniel García
227779256c
Merge branch 'BlackDex-dep-update' into main
2021-07-25 19:07:04 +02:00
Daniel García
c666497130
Update webvault to 2.21.1
2021-07-25 18:56:06 +02:00
Daniel García and GitHub
2620a1ac8c
Merge pull request #1869 from BlackDex/webauthn-plus-updates
...
Fix WebAuthn issues and some small updates
2021-07-25 17:23:37 +02:00
Daniel García
56ffec40f4
Formatting
2021-07-15 21:52:17 +02:00
Daniel García
96c2416903
Merge branch 'BlackDex-future-web-vault' into main
2021-07-15 21:51:52 +02:00
Daniel García
e19420160f
Simplify 2fa removed email and remove extra table close in the footer
2021-07-15 21:25:46 +02:00
Daniel García
1741316f42
Merge branch 'olivierIllogika-2fa_enforcement' into main
2021-07-15 19:27:45 +02:00
Daniel García
4f08167d6f
Merge branch '2fa_enforcement' of https://github.com/olivierIllogika/bitwarden_rs into olivierIllogika-2fa_enforcement
2021-07-15 19:27:36 +02:00
Daniel García
fef76e2f6f
Merge branch 'BlackDex-attachment-storage' into main
2021-07-15 19:20:57 +02:00
Daniel García
f16d56cb27
Merge branch 'attachment-storage' of https://github.com/BlackDex/vaultwarden into BlackDex-attachment-storage
2021-07-15 19:20:52 +02:00
Daniel García
120b286f2b
Merge branch 'umireon-umireon-add-edge-frame-ancestors' into main
2021-07-15 19:20:25 +02:00
Daniel García
7f437b6947
Merge branch 'umireon-add-edge-frame-ancestors' of https://github.com/umireon/vaultwarden into umireon-umireon-add-edge-frame-ancestors
2021-07-15 19:20:19 +02:00
Daniel García
8d6e62e18b
Merge branch 'jjlin-password-hints' into main
2021-07-15 19:18:30 +02:00
Daniel García
d0ec410b73
Merge branch 'password-hints' of https://github.com/jjlin/vaultwarden into jjlin-password-hints
2021-07-15 19:18:22 +02:00
Daniel García
c546a59c38
Dependency updates
2021-07-15 19:18:16 +02:00
Daniel García
e5ec245626
Protect namedfile against path traversal, rocket only does it for pathbuf
2021-07-15 19:15:55 +02:00
Daniel García and GitHub
3968bc8016
Merge pull request #1800 from BlackDex/pre-commit
...
Adding pre-commit config
2021-07-04 21:58:43 +02:00
Daniel García and GitHub
ff66368cb6
Merge pull request #1830 from BlackDex/vaultwarden-logo
...
Storing the original Vaultwarden svg images
2021-07-04 21:58:29 +02:00
Daniel García and GitHub
832f838ddd
Merge pull request #1809 from BlackDex/fix-armv7
...
Fix armv7 alpine build.
2021-06-29 17:16:57 +02:00
Daniel García and GitHub
72e1946ce5
Merge pull request #1799 from BlackDex/issue-1796
...
Fixes issue with multiple security keys.
2021-06-27 18:23:15 +02:00
Daniel García
e3a2dfffab
Formatting
2021-06-26 14:21:58 +02:00
Daniel García
8bf1278b1b
Update web vault and docker base images
2021-06-26 14:08:06 +02:00
Daniel García
00ce943ea5
Merge branch 'BlackDex-security-md' into main
2021-06-26 13:36:14 +02:00