Commit Graph

Select branches

Hide Pull Requests

main

non_editable

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

#3796

#3797

#38

#3803

#3804

#3806

#3808

#381

#3813

#382

#3821

#3831

#385

#3859

#386

#387

#3870

#3870

#3899

#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

#5626

#5634

#5673

#5673

#5680

#5691

#5694

#5696

#5696

#5698

#5703

#5709

#571

#5712

#5715

#5719

#5719

#5742

#5743

#5744

#5745

#5746

#5748

#5749

#5752

#5762

#5763

#582

#585

#589

#599

#604

#61

#61

#621

#624

#631

#638

#639

#64

#643

#644

#648

#65

#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

upstream/diesel2

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

• 2e7fa6440b Do not spawn WS thread if it's disabled Miroslav Prasil 2018-10-15 15:08:15 +0100
• 9ecc98c3cc Disable WebSockets negotiation by default Miroslav Prasil 2018-10-14 23:25:16 +0100
• 02fd68d63b
  Merge pull request #218 from janost/refactor-folder-save Daniel García 2018-10-14 20:07:27 +0200
• 235bce1ecb
  Merge pull request #220 from janost/refactor-user-save Daniel García 2018-10-14 20:07:04 +0200
• e985221b50 User::save() should return QueryResult instead of bool janost 2018-10-14 19:32:43 +0200
• 77cf63c06d Folder::save() should return QueryResult instead of bool janost 2018-10-14 14:55:00 +0200
• faec050a6d
  Merge pull request #217 from janost/refactor-device-save Daniel García 2018-10-14 17:35:59 +0200
• 22304f4925
  Merge pull request #219 from janost/refactor-organization-save Daniel García 2018-10-14 17:35:30 +0200
• 58a78ffa54 Device::save() should return QueryResult instead of bool janost 2018-10-14 14:28:12 +0200
• 64f6c60bfd Organization::save() and UserOrganization::save() should return QueryResult instead of bool janost 2018-10-14 16:04:23 +0200
• e0614620ef
  Merge pull request #216 from mprasil/superuser 1.3.0 Daniel García 2018-10-13 17:16:06 +0200
• a28caa33ef Implement poor man's admin panel Miroslav Prasil 2018-10-12 15:20:10 +0100
• ce4fedf191
  Change error response to be closer to upstream Daniel García 2018-10-10 20:37:04 +0200
• f2078a3849
  Merge pull request #213 from janost/refactor-collectioncipher-save-delete Daniel García 2018-10-07 16:06:47 +0200
• 5292d38c73 CollectionCipher::save() and delete() should return QueryResult instead of bool janost 2018-10-06 23:56:05 +0200
• 1049646e27
  Merge pull request #210 from janost/cipher-save-refactor Daniel García 2018-10-06 16:08:04 +0200
• 380cf06211 Cipher::save() should return QueryResult instead of bool janost 2018-10-06 14:13:49 +0200
• 1f35ef2865
  Merge pull request #209 from janost/resend-invitation-error-message mprasil 2018-10-05 23:21:08 +0100
• c29bc9309a Return proper error message for org reinvite janost 2018-10-05 11:38:02 +0200
• 7112c86471
  Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file Daniel García 2018-10-04 00:01:04 +0200
• 2aabf14372
  Merge pull request #206 from mprasil/collection_revision Daniel García 2018-10-01 19:31:43 +0200
• 77ff9c91c5
  Merge pull request #207 from mprasil/continuation_token Daniel García 2018-10-01 19:31:11 +0200
• d9457e929c Add continuation token when we return object list Miroslav Prasil 2018-10-01 17:02:58 +0100
• 86b49856a7 Handle return value from Collection::save() Miroslav Prasil 2018-10-01 17:50:31 +0100
• 54f54ee845 Update revision for users on collection save Miroslav Prasil 2018-10-01 16:52:36 +0100
• 015bd28cc2
  Merge pull request #201 from mprasil/aarch64 Daniel García 2018-10-01 17:40:20 +0200
• 990c83a037
  Merge pull request #204 from mprasil/org_improvements Daniel García 2018-10-01 17:40:14 +0200
• c3c74506a7 Add missing fields to returned Org json Miroslav Prasil 2018-10-01 16:00:11 +0100
• fb4e6bab14 Clean up the share_collection handling Miroslav Prasil 2018-10-01 15:59:10 +0100
• fe38f95f15 Add dockerfile for aarch64 (arm64) Miroslav Prasil 2018-09-27 15:05:50 +0100
• 9eaa9c1a17
  Add WEBSOCKET_ADDRESS config option (Fixes #199) Daniel García 2018-09-28 13:46:13 +0200
• 8ee681c4a3
  Merge pull request #200 from mprasil/copy_fix Daniel García 2018-09-28 13:31:40 +0200
• 08aee97c1d Remove unecessary copy from armv7 Dockerfile Miroslav Prasil 2018-09-28 09:49:10 +0100
• 2bb6482bec
  Merge branch 'openssl-fix' 1.2.0 Daniel García 2018-09-20 22:52:58 +0200
• c169095128
  Update dependencies to point to upstream lettre Daniel García 2018-09-20 22:45:19 +0200
• b1397c95ca
  Remove unnecessary path in PROXY.md Daniel García 2018-09-19 22:33:12 +0200
• 3df31e3464
  Temp fix for OpenSSL 1.1.1 compatibility Daniel García 2018-09-19 21:45:50 +0200
• 638a0fd3c3
  Updated dependencies Daniel García 2018-09-19 21:43:03 +0200
• ebb66c374e
  Implement KDF iterations change (Fixes #195) Daniel García 2018-09-19 17:30:14 +0200
• 89e3c41043
  Merge pull request #191 from mprasil/vault_2.3.0 Daniel García 2018-09-18 16:03:10 +0200
• 3da410ef71 Update Vault to v2.3.0 Miroslav Prasil 2018-09-18 13:53:25 +0100
• 2dccbd3412
  Merge pull request #190 from mprasil/invite_readme Daniel García 2018-09-18 14:36:39 +0200
• 2ff529ed99
  Merge pull request #189 from mprasil/delete_fix Daniel García 2018-09-18 14:36:31 +0200
• 4fae1e4298 Update the Invitation workflow documentation Miroslav Prasil 2018-09-18 11:49:20 +0100
• f7951b44ba Add alias for DELETE call on accounts Miroslav Prasil 2018-09-18 11:13:45 +0100
• ff8eeff995
  Merge pull request #184 from mprasil/code_block_fix Daniel García 2018-09-16 15:44:05 +0200
• 00019dc356 Added some formating and link Miroslav Prasil 2018-09-16 12:36:08 +0100
• 404fe5321e Fixed code block Miroslav Prasil 2018-09-16 12:27:29 +0100
• e7dd239d20
  Merge pull request #182 from dobunzli/master Daniel García 2018-09-15 20:03:58 +0200
• 071f3370e3
  Merge pull request #183 from jkaberg/traefik_example_proxy Daniel García 2018-09-15 20:03:34 +0200
• ee321be579
  traefik example Joel Kåberg 2018-09-14 23:22:38 +0200
• eb61425da5
  Update README.md dobunzli 2018-09-14 22:39:58 +0200
• b75ba216d1
  Return default prelogin values when the user doesn't exist Daniel García 2018-09-13 23:04:52 +0200
• 8651df8c2a
  Fixed some lint issues Daniel García 2018-09-13 21:55:23 +0200
• 948554a20f
  Added config option for websocket port, and reworked the config parsing a bit. Added SMTP_FROM config to examples and made it mandatory, it doesn't make much sense to not specify the from address. Daniel García 2018-09-13 20:59:51 +0200
• 9cdb605659
  Include more proxy examples Daniel García 2018-09-13 17:08:16 +0200
• 928e2424c0
  Updated dependencies and fixed errors Daniel García 2018-09-13 16:04:00 +0200
• a01fee0b9f
  Merge branch 'ws' Daniel García 2018-09-13 15:59:45 +0200
• 924e4a17e5
  Merge pull request #175 from stammw/master 1.1.0 Daniel García 2018-09-13 15:46:52 +0200
• fdbd73c716
  Merge branch 'master' into master Daniel García 2018-09-13 15:39:28 +0200
• f397f0cbd0
  Implement organization import for admins and owners (Fixes #178) Daniel García 2018-09-13 15:16:24 +0200
• 4d2c6e39b2
  Merge pull request #177 from mprasil/raspberry Daniel García 2018-09-13 00:19:15 +0200
• 3e1afb139c
  Remove unnecessary return Daniel García 2018-09-12 23:58:02 +0200
• af69606bea Documentation for SMTP and password hint configuration Jean-Christophe BEGUE 2018-09-11 23:25:14 +0200
• bc8ff14695 Fix the binary path Miroslav Prasil 2018-09-12 13:51:43 +0100
• 5f7b220eb4 Initial shot as cross compilation Miroslav Prasil 2018-08-30 17:35:02 +0100
• 67adfee5e5 Some documentation Daniel García 2018-09-11 17:26:00 +0200
• d66d4fd87f Add error message when the proxy doesn't route websockets correctly Daniel García 2018-09-11 17:09:33 +0200
• 1b20a25514
  Merge pull request #173 from mprasil/poormans_invites Daniel García 2018-09-11 16:48:56 +0200
• c1cd4d9a6b Modify User::new to be keyless and paswordless Miroslav Prasil 2018-09-11 14:25:12 +0100
• b63693aefb
  Merge pull request #137 from stammw/master Daniel García 2018-09-11 14:58:09 +0200
• ec05f14f5a Implement poor man's invitation via Organization invitation Miroslav Prasil 2018-09-10 14:51:40 +0100
• 37d88be2be return an error when email adress for password hint is not valid Jean-Christophe BEGUE 2018-09-11 13:12:24 +0200
• 1c641d7635 Special messages when user has no password hint Jean-Christophe BEGUE 2018-09-11 13:04:34 +0200
• e2ab2f7306 Save None instead of empty password hint Jean-Christophe BEGUE 2018-09-11 13:00:59 +0200
• 434551e012
  Merge pull request #171 from shauder/ws Daniel García 2018-09-04 21:18:16 +0200
• 69dcbdd3b2 Merge branch 'master' into ws Daniel García 2018-09-04 17:46:38 +0200
• 8df6f79f19
  Merge pull request #170 from mprasil/org-user-edit Daniel García 2018-09-04 17:32:16 +0200
• 422f7ccfa8 Expose 3012 in docker build file for notifications Shane A. Faulkner 2018-09-04 10:22:17 -0500
• c58682e3fb Fix the logic in user edditing Miroslav Prasil 2018-09-04 16:10:26 +0100
• db111ae2a0 Check properly the user membership in Organization Miroslav Prasil 2018-09-04 13:37:44 +0100
• 049aa33f17 Fix editing users in Organization Miroslav Prasil 2018-09-04 11:24:53 +0100
• b1ac37609f
  Merge pull request #169 from mprasil/http_warning Daniel García 2018-09-03 13:47:05 +0200
• 53e8f78af6 Link to the https setup Miroslav Prasil 2018-09-03 10:59:59 +0100
• 1bced97e04 Add info on running over HTTP (documentation for #153) Miroslav Prasil 2018-09-03 10:53:52 +0100
• f8ae5013cb
  Merge pull request #167 from shauder/ws Daniel García 2018-09-02 00:17:40 +0200
• d8e5e53273 Add notifications for cipher delete and create Shane A. Faulkner 2018-09-01 10:59:13 -0500
• b6502e9e9d Add support for CipherUpdate notifications Shane A. Faulkner 2018-08-31 23:30:53 -0500
• d70864ac73 Initial version of websockets notification support. Daniel García 2018-08-30 17:43:46 +0200
• f94e626021
  Merge pull request #166 from mprasil/alpine Daniel García 2018-08-30 16:47:58 +0200
• 0a3b84b815
  Merge pull request #165 from mprasil/shared_edit_fix Daniel García 2018-08-30 16:47:08 +0200
• d336d89b83 Fix editing shared cipher (fixes #164) Miroslav Prasil 2018-08-30 11:12:29 +0100
• 1a5c1979e3 Move Alpine Dockerfile to separate file Miroslav Prasil 2018-08-30 10:38:38 +0100
• cec9566d2a Merge branch 'master' into alpine Miroslav Prasil 2018-08-29 15:06:50 +0100
• fe473b9e75 `Attachment::save()` returns Result instead of bool (#161) Baelyk 2018-08-29 08:22:19 -0500
• 062ae4dd59 Allow non-Admin user to share to collection (fixes #157) (#159) mprasil 2018-08-29 14:22:03 +0100
• d9c6387b8d Better handling of collection sharing Miroslav Prasil 2018-08-29 10:35:40 +0100
• 45d676eb10 Merge branch 'master' into alpine Miroslav Prasil 2018-08-29 10:07:09 +0100
• 3dea4cd19e `Attachment::save()` returns Result instead of bool Baelyk 2018-08-28 19:43:32 -0500
• 3cfdf9b585 Add DELETE handlers fo cipher and attachment deletion (fixes #158) (#160) mprasil 2018-08-28 23:48:53 +0100