vaultwarden

mirrors/vaultwarden

Fork 0

mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-07-08 15:14:52 -04:00

Commit graph

Select branches

Hide pull requests

cached-config-operations

main

revert-7033-patch-1

test_dylint

#1003

#1004

#1006

#1007

#1009

#1010

#1012

#1014

#1017

#1018

#1019

#1020

#1026

#1029

#103

#104

#1042

#1044

#1046

#1048

#1049

#1055

#106

#1061

#1067

#1069

#107

#1075

#1076

#108

#1082

#1083

#1087

#1089

#109

#1094

#1095

#1096

#1099

#11

#1106

#1108

#111

#1111

#1112

#1115

#1116

#1119

#1124

#1125

#1135

#1137

#1140

#1141

#1143

#1146

#1148

#115

#1150

#1151

#1154

#1158

#116

#1160

#1170

#1171

#1172

#1173

#1175

#1176

#1178

#1181

#1198

#1199

#12

#120

#1211

#1212

#1219

#1220

#1222

#1223

#1229

#123

#1234

#1235

#1236

#1242

#1243

#1244

#1245

#1247

#125

#1252

#1257

#1261

#1262

#1265

#1266

#1267

#1270

#128

#1282

#129

#1293

#1299

#13

#130

#1304

#131

#1314

#1316

#1321

#1326

#1327

#1328

#1329

#133

#1333

#134

#1341

#135

#1353

#1355

#1356

#136

#137

#1377

#138

#1389

#139

#14

#140

#141

#1413

#1415

#143

#1432

#144

#1443

#1444

#1447

#145

#146

#1460

#1463

#1469

#147

#148

#1487

#1493

#1499

#150

#151

#152

#1529

#1530

#1545

#1546

#1548

#1550

#1552

#1556

#156

#1565

#1575

#1576

#1579

#1583

#1584

#1587

#159

#16

#160

#1602

#1604

#161

#1636

#1640

#1641

#165

#1650

#1653

#1659

#166

#1663

#167

#1670

#1679

#1682

#1688

#1689

#169

#1696

#17

#170

#1700

#1702

#1704

#1706

#171

#173

#1730

#1736

#175

#1761

#177

#1777

#1779

#1789

#1795

#1799

#18

#1800

#1809

#182

#1829

#183

#1830

#1838

#1839

#184

#1842

#1845

#1848

#1869

#1881

#1886

#189

#19

#190

#191

#1913

#1921

#1922

#1925

#1928

#1945

#1950

#1955

#1959

#1966

#1970

#1973

#1978

#1979

#1980

#1981

#1985

#1989

#1990

#1991

#1992

#1995

#20

#200

#2001

#201

#2027

#2031

#2032

#2033

#204

#2044

#206

#2067

#207

#2073

#2078

#2080

#2084

#209

#210

#2103

#2125

#2127

#213

#2143

#2156

#2158

#216

#2165

#2169

#217

#2170

#2171

#2172

#218

#2182

#2188

#219

#2194

#2195

#2197

#22

#220

#221

#2217

#2218

#2228

#224

#2245

#225

#2255

#2257

#226

#2276

#2292

#231

#2313

#2315

#2328

#233

#234

#2354

#236

#2377

#2379

#2380

#239

#2397

#2398

#24

#240

#2400

#2429

#243

#2433

#244

#2440

#2449

#2451

#2455

#2479

#2480

#2481

#2489

#2491

#2494

#25

#2501

#2507

#2523

#2524

#2529

#2531

#2532

#254

#2543

#2555

#2556

#256

#2561

#2565

#2567

#2568

#257

#2571

#2577

#258

#2586

#2595

#2599

#2605

#2611

#2619

#2624

#263

#2631

#2632

#2650

#2665

#2667

#2675

#268

#2693

#2698

#27

#2713

#2715

#2724

#2729

#2732

#2738

#2739

#274

#2744

#2746

#2747

#2756

#2758

#2765

#2768

#2772

#2773

#2784

#2786

#2787

#2795

#2799

#28

#2803

#2804

#2805

#2806

#2810

#2811

#2812

#2813

#2816

#2834

#284

#2840

#2844

#2846

#285

#2852

#2859

#2864

#2867

#2868

#2869

#2872

#2873

#2877

#2878

#2886

#2888

#289

#2893

#2894

#2899

#29

#2907

#291

#2910

#2911

#2918

#2919

#2920

#2921

#2928

#293

#2933

#2936

#294

#2940

#2941

#2945

#2947

#2948

#295

#2953

#2954

#296

#2963

#2968

#2969

#297

#2970

#2971

#2973

#2976

#2994

#2995

#2996

#3006

#302

#3033

#3058

#3059

#3061

#3065

#3076

#308

#3087

#3092

#3093

#31

#3108

#311

#3116

#312

#3122

#3124

#3126

#3128

#3130

#3131

#3132

#3133

#3134

#3135

#3136

#3139

#314

#3145

#3147

#315

#3151

#3154

#3157

#3163

#3164

#3165

#3167

#3168

#3170

#318

#32

#321

#3210

#3215

#3228

#323

#3231

#3234

#3237

#3240

#3245

#3251

#3252

#3254

#326

#3262

#3263

#3267

#3277

#3281

#3282

#3285

#3288

#3289

#3290

#3304

#3307

#3310

#3315

#3329

#3332

#3347

#3348

#3354

#3363

#3365

#3366

#3367

#3376

#3390

#3397

#3398

#34

#3403

#3404

#3405

#3427

#343

#3434

#3436

#3438

#3439

#3440

#3446

#3469

#347

#3475

#348

#3491

#35

#3502

#3505

#3513

#3522

#3532

#3546

#3547

#3548

#3563

#3568

#3571

#3572

#3573

#3578

#3579

#3592

#3593

#36

#3603

#3606

#3608

#3609

#3620

#3623

#3631

#3632

#3634

#3639

#3649

#365

#3651

#3659

#3678

#3686

#3690

#370

#3704

#3715

#372

#3730

#3734

#3735

#3740

#3748

#3751

#3752

#3754

#3757

#3769

#377

#378

#3786

#3792

#3796

#3797

#38

#3803

#3804

#3806

#3808

#381

#3813

#382

#3821

#3831

#385

#3859

#386

#387

#3870

#3899

#39

#3909

#391

#3910

#3911

#393

#394

#3950

#3951

#3958

#3959

#396

#3964

#3965

#398

#3981

#3982

#3986

#3988

#3989

#3990

#3994

#3997

#4001

#401

#402

#4025

#4030

#404

#4043

#4045

#4056

#406

#4067

#4074

#4085

#4096

#41

#410

#4100

#4126

#4127

#414

#4143

#4153

#416

#4163

#4168

#4170

#4173

#4201

#4207

#4211

#4227

#4237

#4242

#4243

#4245

#4257

#4260

#4263

#4265

#4267

#4271

#4275

#4276

#4282

#4290

#4297

#4299

#4305

#4308

#4309

#4315

#4317

#4328

#4336

#4337

#4355

#4357

#4364

#4369

#437

#4370

#4371

#4385

#4386

#440

#4400

#4402

#4403

#4408

#4415

#4422

#4436

#4440

#4441

#4445

#4446

#4448

#4468

#4471

#4475

#4477

#4485

#4500

#4516

#4517

#4522

#4524

#4526

#4532

#4539

#4549

#455

#4557

#4558

#456

#4575

#4577

#4578

#4581

#4583

#4585

#4586

#4587

#4589

#4592

#460

#4606

#4637

#4639

#4645

#4648

#4657

#4661

#4670

#4671

#4678

#4685

#4687

#47

#4702

#4703

#4704

#4714

#4715

#4723

#4725

#4726

#473

#4730

#4737

#4740

#4744

#475

#4762

#4763

#4768

#4771

#4772

#4779

#4783

#4784

#4786

#4792

#4800

#4805

#4810

#4812

#4820

#4821

#4823

#4826

#4827

#4831

#4837

#4838

#484

#4840

#4845

#4849

#4856

#486

#4860

#4862

#4869

#4876

#4878

#4879

#4882

#4885

#4889

#4892

#4894

#4896

#4899

#4901

#4903

#4906

#4909

#4916

#4928

#493

#4930

#4931

#4932

#4937

#4939

#4940

#4950

#4951

#4956

#4957

#4961

#4966

#4968

#4971

#4972

#4975

#4977

#5003

#5024

#5037

#5053

#5055

#5072

#5081

#5082

#5093

#5095

#5099

#510

#5100

#5106

#511

#5110

#5112

#5125

#513

#514

#5153

#5171

#5175

#5176

#5180

#5184

#5187

#5188

#5189

#5190

#520

#5200

#521

#5213

#5214

#5215

#5219

#5224

#5225

#5240

#5242

#5248

#525

#5256

#5259

#5260

#5268

#5272

#5281

#5291

#5293

#5298

#5308

#5313

#5320

#5321

#5327

#5332

#5339

#5346

#5348

#5350

#5359

#5366

#5368

#5371

#5374

#5378

#5379

#5382

#5386

#5387

#54

#5403

#5404

#541

#5422

#5438

#5442

#5461

#5467

#5469

#5477

#5482

#5488

#5490

#5491

#55

#5508

#5536

#5537

#5538

#5542

#555

#5551

#5556

#5576

#5591

#5594

#5618

#5620

#5626

#5634

#5673

#5680

#5691

#5694

#5696

#5698

#5703

#5709

#571

#5712

#5715

#5719

#5742

#5743

#5744

#5745

#5746

#5748

#5749

#5752

#5762

#5763

#5779

#5784

#5798

#5802

#582

#5823

#5832

#5833

#5838

#5841

#585

#5850

#5855

#5860

#5871

#5874

#5880

#5886

#589

#5890

#5891

#5905

#5906

#5909

#5910

#5917

#5923

#5928

#5929

#5934

#5937

#5938

#5944

#5955

#5967

#5968

#599

#5991

#5993

#5994

#5995

#5998

#6004

#6017

#6026

#6028

#604

#6041

#6044

#6046

#6054

#6056

#6057

#6058

#6059

#6096

#61

#6100

#6105

#6111

#6113

#6127

#6141

#6144

#6150

#6151

#6152

#6153

#6156

#6157

#6158

#6160

#6164

#6165

#6166

#6167

#6168

#6176

#6185

#6187

#6190

#6193

#6194

#6202

#6205

#6206

#6207

#621

#6222

#6227

#6229

#6233

#6234

#6235

#624

#6240

#6247

#6248

#6262

#6263

#6278

#6279

#6291

#6297

#631

#6321

#6336

#6339

#6340

#6349

#6360

#6364

#6368

#6369

#6371

#6377

#638

#6380

#6381

#6388

#639

#6391

#64

#6411

#6421

#643

#6433

#6437

#644

#6440

#6453

#6458

#6459

#6463

#6468

#6472

#6473

#6476

#648

#6484

#6485

#6487

#6491

#6494

#6495

#6498

#65

#6501

#6508

#6513

#6514

#6518

#652

#6528

#653

#6532

#6533

#6551

#6554

#6555

#6556

#6557

#6566

#657

#6570

#6572

#6574

#6577

#6578

#6585

#6590

#6598

#660

#6600

#6626

#6627

#6629

#6632

#664

#6640

#6646

#6649

#666

#6665

#667

#6673

#6676

#6686

#6694

#670

#6701

#671

#6712

#6721

#6726

#6727

#673

#6733

#6734

#6736

#6749

#6761

#6765

#677

#6776

#679

#6799

#68

#6810

#6811

#6819

#6820

#6824

#6828

#6833

#6840

#6843

#6844

#6852

#6853

#6855

#6866

#6867

#6878

#6879

#6880

#6881

#6882

#6890

#6891

#6892

#690

#6900

#6904

#6910

#6916

#6920

#6921

#6922

#6929

#6934

#6935

#6936

#6949

#695

#696

#6961

#6967

#6980

#6981

#6983

#6986

#6987

#6989

#6990

#6991

#6992

#6993

#6994

#6995

#6996

#6997

#6998

#70

#7004

#7008

#701

#7012

#7013

#7017

#7027

#703

#7031

#7032

#7033

#7034

#704

#7042

#7045

#7047

#7048

#7051

#7057

#7061

#7064

#7065

#7068

#7070

#7075

#7079

#7080

#7081

#7082

#7083

#7085

#7093

#7097

#710

#7102

#7104

#7105

#7108

#711

#7115

#7121

#7127

#7128

#7129

#713

#7130

#7137

#7143

#7144

#7147

#7154

#7156

#7157

#716

#7161

#7162

#7163

#7164

#7165

#7171

#7173

#7174

#7175

#7180

#7187

#7191

#7197

#7199

#72

#720

#7200

#7209

#7225

#7235

#7236

#7243

#7246

#7248

#725

#7254

#7265

#7270

#7272

#7274

#7276

#7278

#728

#7283

#7284

#7287

#7295

#7296

#7297

#7298

#730

#7307

#7308

#7320

#733

#7336

#7346

#7347

#7354

#7357

#7358

#7363

#7367

#7370

#7378

#738

#7381

#7382

#7397

#74

#7406

#741

#755

#779

#784

#800

#803

#804

#808

#81

#812

#82

#824

#831

#839

#84

#864

#866

#868

#876

#879

#888

#89

#892

#900

#901

#903

#906

#91

#910

#911

#912

#916

#918

#919

#92

#922

#927

#928

#932

#933

#939

#941

#949

#956

#957

#959

#960

#966

#978

#979

#987

#988

#989

#990

#991

#994

#998

0.10.0

0.11.0

0.12.0

0.13.0

0.9.0

1.0.0

1.1.0

1.10.0

1.11.0

1.12.0

1.13.0

1.13.1

1.14

1.14.1

1.14.2

1.15.0

1.15.1

1.16.0

1.16.1

1.16.2

1.16.3

1.17.0

1.18.0

1.19.0

1.2.0

1.20.0

1.21.0

1.22.0

1.22.1

1.22.2

1.23.0

1.23.1

1.24.0

1.25.0

1.25.1

1.25.2

1.26.0

1.27.0

1.28.0

1.28.1

1.29.0

1.29.1

1.29.2

1.3.0

1.30.0

1.30.1

1.30.2

1.30.3

1.30.4

1.30.5

1.31.0

1.32.0

1.32.1

1.32.2

1.32.3

1.32.4

1.32.5

1.32.6

1.32.7

1.33.0

1.33.1

1.33.2

1.34.0

1.34.1

1.34.2

1.34.3

1.35.0

1.35.1

1.35.2

1.35.3

1.35.4

1.35.5

1.35.6

1.35.7

1.35.8

1.36.0

1.4.0

1.5.0

1.6.0

1.6.1

1.7.0

1.8.0

1.9.0

1.9.1

bda123b1eb

Merge pull request #2169 from BlackDex/issue-2151 Daniel García 2021-12-24 20:40:07 +01:00
2c94ea075c

Small changes to icon log messages. BlackDex 2021-12-24 18:24:25 +01:00
4bd8eae07e

Fixed #2151 BlackDex 2021-12-24 17:59:12 +01:00
5529264c3f

Basic ratelimit for user login (including 2FA) and admin login Daniel García 2021-12-22 21:48:49 +01:00
0a5df06e77

Merge pull request #2158 from jjlin/icons Daniel García 2021-12-22 15:46:30 +01:00
2f9ac61a4e Add support for external icon services Jeremy Lin 2021-12-20 01:34:31 -08:00
840cf8740a

Merge pull request #2156 from jjlin/global-domains Daniel García 2021-12-19 17:39:45 +01:00
d8869adf52 Sync global_domains.json to bitwarden/server@224bfb6 (Wells Fargo) Jeremy Lin 2021-12-18 16:15:07 -08:00
a631fc0077 Sync global_domains.json to bitwarden/server@2f518fb (Ubisoft) Jeremy Lin 2021-12-18 16:14:31 -08:00
157e1b6789

Merge branch 'main' into dependabot Felix 2021-12-17 14:06:47 +01:00
9e4d372213

Update web vault to 2.25.0 1.23.1 Daniel García 2021-12-13 00:02:13 +01:00
c0cae06c7c

Merge branch 'main' into dependabot Felix 2021-12-11 14:13:44 +01:00
ff08bcfa18

Updated rust stable to the latest version BlackDex 2021-12-09 18:04:44 +01:00
24eeea4faa

await the mutex in db_run and use block_in_place for it's contents Daniel García 2021-11-22 00:01:23 +01:00
15464bacab

Upd Dockerfiles, crates. Fixed rust 2018 idioms BlackDex 2021-11-19 17:50:16 +01:00
8fc15bd3ae

Async/Awaited all db methods BlackDex 2021-11-16 17:07:55 +01:00
fc9baaea83

Update to rocket 0.5 and made code async, missing updating all db calls, that are currently blocking Daniel García 2021-11-07 18:53:39 +01:00
d0bf0ab237

Merge pull request #2125 from BlackDex/trust-dns Daniel García 2021-12-08 00:26:31 +01:00
0f64848edf

Added: Dependabot.yml GoliathLabs 2021-12-03 15:49:44 +01:00
e327583aa5

Enabled trust-dns and some updates. BlackDex 2021-11-28 13:02:27 +01:00
fb801c95d4

Upd Dockerfiles, crates. Fixed rust 2018 idioms BlackDex 2021-11-19 17:50:16 +01:00
b36129a6a5

Async/Awaited all db methods BlackDex 2021-11-16 17:07:55 +01:00
39ea7fcf2d

Update to rocket 0.5 and made code async, missing updating all db calls, that are currently blocking Daniel García 2021-11-07 18:53:39 +01:00
ead2f02cbd

Merge pull request #2084 from BlackDex/minimize-macro-recursion Daniel García 2021-11-06 22:00:37 +01:00
c453528dc1

Macro recursion decrease and other optimizations BlackDex 2021-11-05 19:18:54 +01:00
6ae48aa8c2

Merge pull request #2080 from jjlin/fix-postgres-migration Daniel García 2021-11-01 14:33:47 +01:00
88643fd9d5

Merge pull request #2078 from jjlin/fix-ea-reject Daniel García 2021-11-01 14:33:39 +01:00
73e0002219

Merge pull request #2073 from jjlin/fix-access-logic Daniel García 2021-11-01 14:33:29 +01:00
c49ee47de0 Fix PostgreSQL migration Jeremy Lin 2021-10-31 17:50:00 -07:00
14408396bb Fix missing encrypted key after emergency access reject Jeremy Lin 2021-10-31 02:14:18 -07:00
6cbb724069 Fix conflict resolution logic for read_only and hide_passwords flags Jeremy Lin 2021-10-29 11:45:43 -07:00
a2316ca091

Merge pull request #2067 from jjlin/incomplete-2fa Daniel García 2021-10-28 18:00:03 +02:00
c476e19796 Add email notifications for incomplete 2FA logins Jeremy Lin 2021-10-25 01:36:05 -07:00
9f393cfd9d

Formatting Daniel García 2021-10-27 23:00:26 +02:00
450c4d4d97

Update web vault to 2.24.1 Daniel García 2021-10-27 22:46:12 +02:00
75e62abed0

Move database_max_conns Daniel García 2021-10-24 22:22:28 +02:00
97f9eb1320

Update dependencies Daniel García 2021-10-24 21:50:26 +02:00
53cc8a65af

Add doc comments to the functions in Config, and remove some unneeded pubs Daniel García 2021-10-23 20:46:39 +02:00
f94ac6ca61

Merge pull request #2044 from jjlin/emergency-access-cleanup 1.23.0 Daniel García 2021-10-19 20:14:29 +02:00
cee3fd5ba2 Emergency Access cleanup Jeremy Lin 2021-10-19 01:27:50 -07:00
016fe2269e

Update dependencies Daniel García 2021-10-18 22:14:29 +02:00
03c0a5e405

Update web vault image to v2.23.0c Daniel García 2021-10-18 22:06:35 +02:00
cbbed79036

Merge branch 'domdomegg-domdomegg/2fa-check-accepted' into main Daniel García 2021-10-18 21:13:57 +02:00
4af81ec50e

Merge branch 'domdomegg/2fa-check-accepted' of https://github.com/domdomegg/vaultwarden into domdomegg-domdomegg/2fa-check-accepted Daniel García 2021-10-18 21:13:50 +02:00
a5ba67fef2

Merge branch 'BlackDex-alive-db-check' into main Daniel García 2021-10-18 21:13:29 +02:00
4cebe1fff4

cargo fmt Adam Jones 2021-10-09 15:42:06 +01:00
a984dbbdf3

2FA org policy: do not enforce on invited (not accepted) users Adam Jones 2021-10-09 13:54:30 +01:00
881524bd54

Added DbConn to /alive healthcheck BlackDex 2021-10-09 14:16:27 +02:00
44da9e6ca7

Merge branch 'BlackDex-update-openssl-amd64-alpine' into main Daniel García 2021-10-08 22:29:19 +02:00
4c0c8f7432

Merge branch 'update-openssl-amd64-alpine' of https://github.com/BlackDex/vaultwarden into BlackDex-update-openssl-amd64-alpine Daniel García 2021-10-08 22:29:13 +02:00
f67854c59c

Merge branch 'BlackDex-mail-errors' into main Daniel García 2021-10-08 22:28:54 +02:00
a1c1b9ab3b

Merge branch 'mail-errors' of https://github.com/BlackDex/vaultwarden into BlackDex-mail-errors Daniel García 2021-10-08 22:28:46 +02:00
395979e834

Merge branch 'domdomegg-domdomegg/single-organization-policy' into main Daniel García 2021-10-08 22:27:31 +02:00
fce6cb5865

Update OpenSSL via an updated clux build image. BlackDex 2021-10-08 16:46:29 +02:00
338756550a

Fix error reporting in admin and some small fixes BlackDex 2021-10-08 00:01:24 +02:00
d014eede9a

feature: Support single organization policy Adam Jones 2021-09-24 17:55:49 +02:00
9930a0d752

Merge pull request #2001 from BlackDex/issue-1998 Daniel García 2021-09-27 19:59:59 +02:00
9928a5404b

Revert Debian images back to Buster. BlackDex 2021-09-27 17:27:47 +02:00
a6e0ddcdf1

Merge branch 'domdomegg-domdomegg/support-no-data-org-policies' into main Daniel García 2021-09-26 23:21:30 +02:00
acab70ed89

Merge branch 'domdomegg/support-no-data-org-policies' of https://github.com/domdomegg/vaultwarden into domdomegg-domdomegg/support-no-data-org-policies Daniel García 2021-09-26 23:21:24 +02:00
c0d149060f

Merge branch 'BlackDex-icon-download-update' into main Daniel García 2021-09-26 23:20:55 +02:00
344f00d9c9

Merge branch 'icon-download-update' of https://github.com/BlackDex/vaultwarden into BlackDex-icon-download-update Daniel García 2021-09-26 23:20:44 +02:00
b26afb970a

Merge branch 'Makishima-patch-1' into main Daniel García 2021-09-26 23:19:36 +02:00
34ed5ce4b3

Update README.md Nikolay 2021-09-25 13:10:06 +03:00
9375d5b8c2 Updated icon downloading BlackDex 2021-09-24 18:27:52 +02:00
145487bb9d

docs: Add basic contributing details to README Adam Jones 2021-09-24 17:37:30 +02:00
e3678b4b56

fix: Support no-data enterprise policies Adam Jones 2021-09-24 17:20:44 +02:00
b4c95fb4ac

Hide some warnings for unused struct fields Daniel García 2021-09-22 21:39:31 +02:00
0bb33e04bb

Update dependencies and ser cargo resolver to version 2 ahead of 2021 edition Daniel García 2021-09-22 20:26:48 +02:00
4d33e24099

Update web vault to 2.23.0 Daniel García 2021-09-22 20:26:17 +02:00
e6ec777b9e

updated webvault patch Stuart Heap 2021-09-22 13:56:28 +02:00
0f6987d6ba

avoid panics Stuart Heap 2021-09-22 13:50:53 +02:00
5c7161d1a6

split sso_config into own table Stuart Heap 2021-09-22 11:44:23 +02:00
519feba798

add missing files Stuart Heap 2021-09-20 13:12:41 +02:00
bba76c856a

add sso_nonce to database, with checking Stuart Heap 2021-09-20 13:09:57 +02:00
7beebe3cdc

inline error responses. Cover more cases in prevalidate Stuart Heap 2021-09-17 13:49:23 +02:00
ce6a11426c

use String instead of &RawStr Stuart Heap 2021-09-16 17:40:36 +02:00
92b4c7efe6

nullable fields Stuart Heap 2021-09-16 17:22:36 +02:00
4d39197df2

use migrations properly, avoid panics Stuart Heap 2021-09-16 15:58:11 +02:00
302a3131a2

bump web version to v2.22.3 Vivi 2021-09-21 18:06:50 +00:00
2cdce04662

Merge branch 'thelittlefireman-emergency_feature' into main Daniel García 2021-09-19 23:54:28 +02:00
756d108f6a

Merge branch 'emergency_feature' of https://github.com/thelittlefireman/bitwarden_rs into thelittlefireman-emergency_feature Daniel García 2021-09-19 23:54:19 +02:00
ca20b3d80c [PATCH] Some fixes to the Emergency Access PR thelittlefireman 2021-09-01 12:54:47 +02:00
4ab9362971 Add Emergency contact feature thelittlefireman 2021-03-24 20:15:55 +01:00
4e8828e41a

Merge branch 'BlackDex-admin-interface' into main Daniel García 2021-09-16 21:36:31 +02:00
f8d1cfad2a

Merge branch 'admin-interface' of https://github.com/BlackDex/vaultwarden into BlackDex-admin-interface Daniel García 2021-09-16 21:36:25 +02:00
b0a411b733 Update some JS Libraries and fix small issues BlackDex 2021-09-18 19:49:44 +02:00
81741647f3

Merge branch 'BlackDex-bulk-org-actions' into main Daniel García 2021-09-16 21:36:15 +02:00
f36bd72a7f Add Organization bulk actions support BlackDex 2021-09-18 14:22:14 +02:00
8c10de3edd

Merge pull request #1978 from benarmstead/main Mathijs van Veluw 2021-09-16 19:28:05 +02:00
0ab10a7c43

Merge pull request #1 from benarmstead/update Ben Armstead 2021-09-16 16:02:50 +01:00
a1a5e00ff5 Update dependencies in Cargo.lock Ben Armstead 2021-09-16 15:59:24 +01:00
8af4b593fa Update dependencies in cargo.toml Ben Armstead 2021-09-16 15:58:49 +01:00
9bef2c120c Update dependencies Ben Armstead 2021-09-16 14:21:06 +01:00
47d5320df4

trivial PR feedback - missing files from web-vault patch Stuart Heap 2021-09-15 16:59:16 +02:00
f7d99c43b5

Merge pull request #1973 from BlackDex/optimize-release Daniel García 2021-09-13 20:39:48 +02:00
ca0fd7a31b Optimize release workflow. BlackDex 2021-09-13 12:00:52 +02:00
9e1550af8e

Merge branch 'BlackDex-issue-1963' into main Daniel García 2021-09-09 20:30:38 +02:00
a99c9715f6

Merge branch 'issue-1963' of https://github.com/BlackDex/vaultwarden into BlackDex-issue-1963 Daniel García 2021-09-09 20:30:29 +02:00
1a888b5355

Merge branch 'jjlin-personal-ownership-imports' into main Daniel García 2021-09-09 20:30:13 +02:00