Commit Graph

Select branches

Hide Pull Requests

main

test_dylint

#1

#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

#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

#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

#2

#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

#3

#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

#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

#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

#4589

#4592

#460

#4606

#4637

#4639

#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

#5551

#5556

#5576

#5591

#5591

#5594

#5618

#5620

#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

#5910

#5917

#5923

#5928

#5929

#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

#61

#6100

#6105

#6111

#6113

#6127

#6127

#6141

#6144

#6150

#6151

#6152

#6153

#6156

#6157

#6158

#6158

#6160

#6164

#6165

#6166

#6167

#6168

#6176

#6185

#6187

#6190

#6193

#6194

#6202

#6202

#6205

#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

#6349

#6360

#6360

#6364

#6368

#6369

#6371

#6377

#638

#6380

#6381

#6388

#6388

#639

#6391

#64

#6411

#6421

#643

#6433

#6433

#6437

#6437

#644

#6440

#6453

#6458

#6459

#6463

#6468

#6472

#6473

#6476

#648

#6484

#6484

#6485

#6487

#6491

#6491

#6494

#6495

#6495

#6498

#6498

#65

#6501

#6508

#652

#653

#657

#660

#664

#666

#667

#670

#671

#673

#677

#679

#68

#690

#695

#696

#7

#70

#701

#703

#704

#710

#711

#713

#716

#72

#720

#725

#728

#730

#733

#738

#74

#741

#755

#779

#784

#8

#800

#803

#804

#808

#81

#812

#82

#824

#831

#839

#84

#864

#866

#868

#876

#879

#888

#89

#892

#9

#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.4.0

1.5.0

1.6.0

1.6.1

1.7.0

1.8.0

1.9.0

1.9.1

Mono Color

• 00a11b1b78 Stop leaking usernames when SIGNUPS_ALLOWED=false Miro Prasil 2019-11-01 22:34:42 +00:00
• 77b78f0991 Merge pull request #690 from BlackDex/icon-download-http Daniel García 2019-10-29 15:02:59 +01:00
• ee550be80c Added http favicon url when response failed BlackDex 2019-10-29 14:24:01 +01:00
• 97d41c2686 Revert rustup minimal profile, rustup can't be updated Daniel García 2019-10-26 00:55:58 +02:00
• fccc0a4b05 Update rocket to latest master Downgrade rust version to fix cargo issue Set rustup profile to minimal Daniel García 2019-10-24 23:21:04 +02:00
• 57b1d3f850 Update dependencies and docker base images Daniel García 2019-10-24 20:37:17 +02:00
• 77d40833d9 Merge pull request #679 from mprasil/bump-rust-toolchain Daniel García 2019-10-22 19:18:43 +02:00
• 7814218208 Bump rust toolchain Miro Prasil 2019-10-22 16:31:36 +01:00
• 95a7ffdf6b Merge pull request #673 from Jellyfrog/patch-2 Daniel García 2019-10-17 20:21:47 +02:00
• ebc47dc161 Remove unneeded WS logging Jellyfrog 2019-10-17 17:15:11 +02:00
• cd8acc2e8c Merge pull request #671 from vverst/enable-2fa-email Daniel García 2019-10-16 19:55:54 +02:00
• 3b7a5bd102 Move 2FA email config to after SMTP config vpl 2019-10-16 07:10:27 +02:00
• d3054d4f83 Merge pull request #667 from dani-garcia/minimal_profile Daniel García 2019-10-15 22:26:12 +02:00
• 5ac66b05e3 Merge pull request #666 from vverst/fix-2fa-email Daniel García 2019-10-15 22:25:37 +02:00
• 83fd44eeef Update rust version and use minimal profile for CI Daniel García 2019-10-15 21:21:37 +02:00
• 2edecf34ff Use user_uuid instead of mut twofactor vpl 2019-10-15 21:19:27 +02:00
• 18bc8331f9 Send email when preparing 2FA JsonError vpl 2019-10-15 21:19:49 +02:00
• 7d956c5117 Merge pull request #664 from BlackDex/fix-issue-663 Daniel García 2019-10-14 01:25:26 +02:00
• 603a964579 Fixed issue #663. BlackDex 2019-10-14 00:32:44 +02:00
• dc515b83f3 Merge pull request #657 from BlackDex/totp-timedrift Daniel García 2019-10-12 16:33:43 +02:00
• 9466f02696 Recoded TOTP time drift validation BlackDex 2019-10-12 15:28:28 +02:00
• d3bd2774dc Update dependencies to use newer SQLite Daniel García 2019-10-11 22:49:47 +02:00
• f482585d7c Merge pull request #660 from BlackDex/sqlite-backup-fix Daniel García 2019-10-11 15:07:21 +02:00
• 2cde814aaa Fixed a bug with the sqlite backup feature. BlackDex 2019-10-11 12:08:40 +02:00
• d989a19f76 Merge branch 'master' of https://github.com/dani-garcia/bitwarden_rs into totp-timedrift BlackDex 2019-10-11 11:22:13 +02:00
• d292269ea0 Make the blacklist logic be cached Daniel García 2019-10-10 23:21:22 +02:00
• ebf40099f2 Updated authenticator TOTP BlackDex 2019-10-10 17:32:20 +02:00
• 0586c00285 Merge pull request #653 from stevesbrain/master Daniel García 2019-10-10 01:06:51 +02:00
• bb9ddd5680 Merge pull request #1 from stevesbrain/stevesbrain-patch-1 Steve Divskinsy 2019-10-09 22:23:20 +10:30
• cb1663fc12 Very simple grammar updates Steve Divskinsy 2019-10-09 22:22:52 +10:30
• 45d9d8db94 Merge pull request #652 from BlackDex/hibp-changes Daniel García 2019-10-09 00:44:00 +02:00
• edc482c8ea Changed HIBP Error message. BlackDex 2019-10-08 22:29:12 +02:00
• 6e5c03cc78 Some modification when no HIBP API Key is set BlackDex 2019-10-08 21:39:11 +02:00
• 881c1978eb Error when the URL scheme doesn't match the database type Daniel García 2019-10-08 19:34:47 +02:00
• 662bc27523 Updated dependencies and fixed disable_admin_token description Daniel García 2019-10-08 19:33:27 +02:00
• b4b62c22a4 Merge pull request #648 from BlackDex/icon-security 1.11.0 Daniel García 2019-10-08 18:08:32 +02:00
• 05569147af Added missing .env configuration option. BlackDex 2019-10-08 13:30:17 +02:00
• 99a635d327 Merge pull request #643 from BlackDex/icon-security Daniel García 2019-10-05 17:06:14 +02:00
• e6b763026e Merge branch 'master' into icon-security Daniel García 2019-10-05 16:45:36 +02:00
• c182583e09 Merge pull request #644 from BlackDex/issue-565 Daniel García 2019-10-05 16:17:43 +02:00
• d821389c2e Merge pull request #639 from vverst/cors-update Daniel García 2019-10-05 16:09:33 +02:00
• be2916333b Fixed issue #565 BlackDex 2019-10-05 15:45:09 +02:00
• 9124d8a3fb Updated icon blacklisting. BlackDex 2019-10-05 14:48:15 +02:00
• 7b1da527a6 Change CORS headers vpl 2019-10-01 17:26:58 +02:00
• e7b8602e1f Merge pull request #638 from mprasil/add_sqlite_binary Daniel García 2019-10-01 19:50:41 +02:00
• d6e9af909b Remove the unnecessary check for sqlite Miro Prasil 2019-10-01 10:40:22 +01:00
• acdd42935b Add sqlite binary into the docker images Miro Prasil 2019-09-30 13:54:06 +01:00
• 8367d1d715 Merge pull request #631 from vverst/cors-put Daniel García 2019-09-23 20:03:51 +02:00
• 56f12dc982 Use Access-Control-Allow-Method vpl 2019-09-23 07:44:44 +02:00
• 4c07f05b3a Remove Result<T, E: Debug> in preparation of deprecation as Rocket responder. Removed unnecessary returns Daniel García 2019-09-17 21:05:56 +02:00
• b73ff886c3 Use upstream rmp Daniel García 2019-09-17 19:47:51 +02:00
• 2e7bd62353 Merge pull request #624 from swedishborgie/postgresql Daniel García 2019-09-17 18:50:40 +02:00
• 1264eb640a Added a migration that fixes #1 which caused attachments to be broken for the PostgreSQL backend. Also converts any CHAR types to VARCHAR to prevent the same issue from causing problems down the line. Michael Powers 2019-09-16 19:52:00 -04:00
• 3a90364b32 Merge pull request #621 from swedishborgie/postgresql Daniel García 2019-09-16 20:05:05 +02:00
• f5f9861a78 Adds support for PostgreSQL which resolves #87 and is mentioned in #246. This includes migrations as well as Dockerfile's for amd64. Michael Powers 2019-09-12 16:12:22 -04:00
• f9408a00c6 Allow self signed certs and increase a bit the timings Daniel García 2019-09-11 22:01:42 +02:00
• ae8bf954c1 Updated web vault to 2.12 Daniel García 2019-09-07 22:13:56 +02:00
• c656f2f694 Merge pull request #604 from mprasil/fix-healthcheck Daniel García 2019-09-06 10:47:10 +02:00
• eea3f13bb3 Fix #603 and remove mysql from sqlite image Miro Prasil 2019-09-06 09:34:21 +01:00
• df8114f8be Updated client kdf iterations to 100000 and fixed some lints Daniel García 2019-09-05 21:56:12 +02:00
• dda244edd8 Merge pull request #589 from H3npi/H3npi-patch-1 Daniel García 2019-09-05 19:47:10 +02:00
• cce3ce816c Adds environment port to curl healthcheck H3npi 2019-09-04 09:12:53 +02:00
• 65c0d1064b Merge pull request #599 from vverst/cors Daniel García 2019-09-03 20:22:54 +02:00
• 5a2f968d7a Set correct response headers, status code vpl 2019-09-02 21:13:12 +02:00
• 16d88402cb Initial version of CORS support vpl 2019-09-01 13:00:12 +02:00
• 7dcf18151d Fix onsubmit Daniel García 2019-08-31 17:57:47 +02:00
• e3404dd322 Use the local scripts instead of cloudflare, remove jquery and update config so disabling a master toggle doesn't remove the values Daniel García 2019-08-31 17:47:52 +02:00
• bfc517ee80 Remove unused warning Daniel García 2019-08-31 17:26:16 +02:00
• 4a7d2a1e28 Rename static files endpoint Daniel García 2019-08-31 17:25:31 +02:00
• 66a68f6d22 Adds Healthcheck for all docker container H3npi 2019-08-27 11:23:55 +02:00
• 469318bcbd Updated dependencies and web vault version Daniel García 2019-08-27 21:14:15 +02:00
• c07c9995ea Merge pull request #555 from vverst/email-codes Daniel García 2019-08-27 21:07:41 +02:00
• 2c2276c5bb Merge pull request #585 from ViViDboarder/mail-auth-over-insecure 1.10.0 Daniel García 2019-08-27 20:21:23 +02:00
• 672a245548 Remove unecessary clone ViViDboarder 2019-08-27 10:40:38 -07:00
• 5d50b1ee3c Merge remote-tracking branch 'upstream/master' into email-codes vpl 2019-08-26 21:38:45 +02:00
• c99df1c310 Compare token using crypto::ct_eq vpl 2019-08-26 20:22:04 +02:00
• 591ae10144 Get token from single u64 vpl 2019-08-26 20:26:54 +02:00
• 2d2745195e Allow explicitly defined smtp auth mechansim ViViDboarder 2019-08-23 16:22:14 -07:00
• 026f9da035 Allow removing users two factors Daniel García 2019-08-21 17:13:06 +02:00
• d23d4f2c1d Allow editing HIBP key in the admin panel Daniel García 2019-08-20 23:53:00 +02:00
• 515b87755a Update HIBP to v3, requires paid API key, fixes #583 Daniel García 2019-08-20 20:07:12 +02:00
• d8ea3d2bfe Merge pull request #582 from vverst/require-device-email-config Daniel García 2019-08-19 22:58:50 +02:00
• ee7837d022 Add option to require new device emails vpl 2019-08-19 22:14:00 +02:00
• 07743e490b Ignore error sending device email Daniel García 2019-08-18 19:32:26 +02:00
• 9101d6e48f Update dependencies Daniel García 2019-08-18 19:31:54 +02:00
• 27c23b60b8 Merge pull request #571 from BlackDex/icon-proxy-support Daniel García 2019-08-15 22:14:10 +02:00
• e7b6238f43 Added reqwest proxy support BlackDex 2019-08-12 17:24:32 +02:00
• ad2225b6e5 Add configuration options for Email 2FA vpl 2019-08-10 22:33:39 +02:00
• 5609103a97 Use ring to generate email token vpl 2019-08-06 22:37:23 +02:00
• 6d460b44b0 Use saved token for email 2fa codes vpl 2019-08-04 16:55:43 +02:00
• efd8d9f528 Remove some unused imports, unneeded mut variables vpl 2019-08-03 20:09:20 +02:00
• 29aedd388e Add email code logic and move two_factor into separate modules vpl 2019-08-03 18:47:52 +02:00
• 27e0e41835 Add email authenticator logic vpl 2019-08-04 16:56:39 +02:00
• 0b60f20eb3 Add email message for twofactor email codes vpl 2019-08-03 08:07:14 +02:00
• 8be2ed6255 Update web vault to 2.11.0 Daniel García 2019-07-30 19:50:35 +02:00
• c9c3f07171 Updated dependencies and fixed panic getting icons Daniel García 2019-07-30 19:38:54 +02:00
• 8a21c6df10 Merge pull request #541 from vverst/mail-new-device Daniel García 2019-07-30 13:18:42 -04:00
• df71f57d86 Move send device email to end of password login vpl 2019-07-25 20:47:58 +02:00
• 60e39a9dd1 Move retrieve/new device from connData to separate function vpl 2019-07-22 08:24:19 +02:00
• bc6a53b847 Add new device email when user logs in vpl 2019-07-22 08:26:24 +02:00