1564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jeremy Lin	6b5fa201aa	Fix the Alpine build	2020-08-26 23:44:34 -07:00
Daniel García	7167e443ca	Merge pull request #1115 from jjlin/favorites ... Delete associated favorites when deleting a cipher or user	2020-08-26 17:54:50 +02:00
Jeremy Lin	175d647e47	Delete associated favorites when deleting a cipher or user ... This prevents foreign key constraint violations.	2020-08-26 01:27:38 -07:00
Daniel García	4c324e1160	Change Dockerfiles to make the AMD image multidb	2020-08-24 20:58:00 +02:00
Daniel García	0365b7c6a4	Add support for multiple simultaneous database features by using macros. ... Diesel requires the following changes: - Separate connection and pool types per connection, the generate_connections! macro generates an enum with a variant per db type - Separate migrations and schemas, these were always imported as one type depending on db feature, now they are all imported under different module names - Separate model objects per connection, the db_object! macro generates one object for each connection with the diesel macros, a generic object, and methods to convert between the connection-specific and the generic ones - Separate connection queries, the db_run! macro allows writing only one that gets compiled for all databases or multiple ones	2020-08-24 20:11:17 +02:00
Daniel García	19889187a5	Merge pull request #1106 from jjlin/favorites ... Track favorites on a per-user basis	2020-08-24 00:31:48 +02:00
Daniel García	9571277c44	Merge pull request #1112 from jjlin/token-size-docs ... Add more docs on the `email_token_size` setting	2020-08-24 00:25:47 +02:00
Daniel García	a202da9e23	Merge pull request #1099 from jjlin/global-domains ... Sync global_domains.json with upstream	2020-08-24 00:25:33 +02:00
Daniel García	e5a77a477d	Merge pull request #1111 from jjlin/token ... Generate tokens more simply and uniformly	2020-08-24 00:25:12 +02:00
Jeremy Lin	c05dc50f53	Add more docs on the email_token_size setting	2020-08-22 17:35:55 -07:00
Jeremy Lin	3bbdbb832c	Transfer favorite status for user-owned ciphers	2020-08-22 17:14:05 -07:00
Jeremy Lin	d9684bef6b	Generate tokens more simply and uniformly	2020-08-22 16:07:53 -07:00
Jeremy Lin	db0c45c172	Sync global_domains.json to bitwarden/server@8383a08 (Yandex)	2020-08-20 03:31:21 -07:00
Jeremy Lin	ad4393e3f7	Sync global_domains.json to bitwarden/server@80f57d2 (Amazon updates)	2020-08-20 03:30:39 -07:00
Jeremy Lin	f83a8a36d1	Track favorites on a per-user basis ... Currently, favorites are tracked at the cipher level. For org-owned ciphers, this means that if one user sets it as a favorite, it automatically becomes a favorite for all other users that the cipher has been shared with.	2020-08-19 02:32:58 -07:00
Jeremy Lin	0e9eba8c8b	Maximize similarity between MySQL and SQLite/PostgreSQL schemas ... In particular, Diesel aliases `Varchar` to `Text`, and `Blob` to `Binary`: * https://docs.diesel.rs/diesel/sql_types/struct.Text.html * https://docs.diesel.rs/diesel/sql_types/struct.Binary.html	2020-08-19 02:32:56 -07:00
Jeremy Lin	d5c760960a	Sync global_domains.json to bitwarden/server@af85e17 (eBay India updates)	2020-08-19 00:40:59 -07:00
Jeremy Lin	2c6ef2bc68	Sync global_domains.json to bitwarden/server@2c43019 (eBay updates)	2020-08-15 01:34:12 -07:00
Jeremy Lin	7032ae5587	Sync global_domains.json to bitwarden/server@6aed80a (Amazon updates)	2020-08-15 01:32:56 -07:00
Daniel García	eba22c2d94	Merge pull request #1095 from jjlin/db-docs ... Add more doc comments for MySQL/PostgreSQL connection URIs	2020-08-13 22:34:46 +02:00
Daniel García	11cc9ae0c0	Merge pull request #1094 from jjlin/master ... Sync global_domains.json to bitwarden/server@61b11e3	2020-08-13 22:34:20 +02:00
Daniel García	fb648db47d	Merge pull request #1096 from mqus/mqus-env-document-override ... Add a note that settings in .env can be overridden	2020-08-13 22:34:03 +02:00
mqus	959283d333	Add a note that settings in .env can be overridden	2020-08-13 17:49:25 +02:00
Jeremy Lin	385c2227e7	Add more doc comments for MySQL/PostgreSQL connection URIs ... Note that Diesel implements its own parser for MySQL connection URIs, so it probably doesn't accept the full range of syntax that would be accepted by MySQL's client libraries, whereas for PostgreSQL, Diesel simply passes the connection string/URI to PostgreSQL's libpq for processing.	2020-08-13 02:33:22 -07:00
Jeremy Lin	6d9f03e84b	Sync global_domains.json to bitwarden/server@61b11e3	2020-08-12 21:10:31 -07:00
Daniel García	6a972e4b19	Make the admin URL redirect try to use the referrer first, and use /admin when DOMAIN is not configured and the referrer check doesn't work, to allow users without DOMAIN configured to use the admin page correctly	2020-08-12 19:07:52 +02:00
Daniel García	171b174ce9	Update dependencies	2020-08-12 18:46:28 +02:00
Daniel García	93b7ded1e6	Remove unneccessary shim for backtrace	2020-08-12 18:45:26 +02:00
Daniel García	29c6b145ca	Remove redundant user fetching from login	2020-08-11 16:48:15 +02:00
Daniel García	a7a479623c	Merge pull request #1087 from jjlin/org-creation-users ... Add support for restricting org creation to certain users	2020-08-08 16:20:15 +02:00
Daniel García	83dff9ae6e	Merge pull request #1083 from jjlin/global-domains ... Add a script to auto-generate the global equivalent domains JSON file	2020-08-08 16:19:30 +02:00
Daniel García	6b2cc5a3ee	Merge pull request #1089 from jjlin/master ... Don't push `latest-arm32v6` tag for MySQL and PostgreSQL images	2020-08-07 20:39:17 +02:00
Jeremy Lin	5247e0d773	Don't push latest-arm32v6 tag for MySQL and PostgreSQL images	2020-08-07 10:15:15 -07:00
Jeremy Lin	05b308b8b4	Sync global_domains.json with upstream	2020-08-06 12:13:40 -07:00
Jeremy Lin	9621278fca	Add a script to auto-generate the global equivalent domains JSON file ... The script works by reading the relevant files from the upstream Bitwarden source repo and generating a matching JSON file. It could potentially be integrated into the build/release process, but for now it can be run manually as needed.	2020-08-06 12:12:32 -07:00
Jeremy Lin	570d6c8bf9	Add support for restricting org creation to certain users	2020-08-05 22:35:29 -07:00
Daniel García	ad48e9ed0f	Fix unlock on desktop clients	2020-08-04 15:12:04 +02:00
Daniel García	f724addf9a	Merge pull request #1076 from jjlin/soft-delete ... Fix soft delete notifications	2020-07-28 17:44:33 +02:00
Daniel García	aa20974703	Merge pull request #1075 from jjlin/master ... Push an extra `latest-arm32v6` tag	2020-07-28 17:43:59 +02:00
Jeremy Lin	a846f6c610	Fix soft delete notifications ... A soft-deleted entry should now show up in the trash folder immediately (previously, an extra sync was required).	2020-07-26 16:19:47 -07:00
Jeremy Lin	c218c34812	Push an extra latest-arm32v6 tag ... This fixes a gap in PR #1069.	2020-07-26 15:28:14 -07:00
Daniel García	2626e66873	Merge pull request #1069 from jjlin/master ... Skip cleanup of `arm32v6` arch-specific tags	2020-07-24 23:05:29 +02:00
Jeremy Lin	81e0e1b339	Skip cleanup of arm32v6 arch-specific tags	2020-07-24 11:32:44 -07:00
Daniel García	fd1354d00e	Merge pull request #1067 from jjlin/log-time-fmt ... Add config option for log timestamp format	2020-07-24 16:42:10 +02:00
Jeremy Lin	071a3b2a32	Log timestamps with milliseconds by default	2020-07-23 14:19:51 -07:00
Daniel García	32cfaab5ee	Updated dependencies and changed rocket request imports	2020-07-23 21:07:04 +02:00
Jeremy Lin	d348f12a0e	Add config option for log timestamp format	2020-07-22 21:50:49 -07:00
Daniel García	11845d9f5b	Merge pull request #1061 from jjlin/use-strip-prefix ... Use `strip_prefix()` instead of `trim_start_matches()` as appropriate	2020-07-21 16:31:31 +02:00
Jeremy Lin	de70fbf88a	Use strip_prefix() instead of trim_start_matches() as appropriate ... As of Rust 1.45.0, `strip_prefix()` is now stable.	2020-07-20 22:33:13 -07:00
Daniel García	0b04caab78	Merge pull request #1029 from jjlin/multi-arch ... Multi-arch image support	2020-07-16 22:59:12 +02:00