Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/github/codeql-action-4.32.1

dependabot/github_actions/lukka/get-cmake-4.2.3

dependabot/pip/cmake/requirements/cppcheck-1.5.1

develop

feature/optional

gh-pages

issue2228

issue2615

issue3989

issue4552-ignore

issue4755-cppcheck-warning

master

nlohmann-patch-1-1

nvcc-image

views-test

#1001

#1004

#1004

#1005

#1005

#1006

#1009

#1024

#1024

#1026

#1028

#104

#104

#1040

#1041

#1043

#1047

#1048

#105

#105

#1058

#1067

#1067

#1069

#1069

#1077

#1077

#1078

#1089

#111

#111

#1117

#1121

#1121

#1124

#1124

#1125

#1125

#1126

#1126

#1128

#1128

#1130

#1134

#1138

#1142

#1144

#115

#1150

#1150

#1151

#1153

#1156

#1156

#116

#116

#1176

#1187

#119

#119

#120

#1200

#1202

#121

#1210

#1210

#1214

#122

#1221

#1222

#1222

#1228

#123

#123

#1230

#1231

#1234

#1234

#1238

#124

#1245

#1249

#1251

#1252

#1254

#1257

#126

#1260

#1262

#1265

#1266

#1266

#1269

#1269

#1270

#1271

#1272

#1277

#1280

#1282

#129

#1294

#130

#1301

#1302

#1302

#1303

#1305

#1307

#1307

#131

#1313

#1314

#1315

#1317

#1320

#1322

#1323

#1326

#1329

#1330

#1342

#1343

#1345

#1346

#1357

#1363

#137

#1376

#1378

#1380

#1382

#1389

#139

#1391

#1392

#1396

#14

#140

#140

#1409

#141

#141

#1411

#1413

#1414

#1417

#1420

#1423

#1425

#1428

#1430

#1431

#1434

#1435

#1436

#1439

#1440

#1441

#1443

#1446

#1451

#1452

#1454

#1455

#146

#1464

#1468

#1469

#1474

#1477

#1488

#1489

#1491

#1492

#1495

#1496

#1514

#1517

#1522

#1523

#1524

#153

#155

#155

#1551

#1555

#1559

#1565

#1570

#1585

#1588

#1598

#1606

#1618

#1625

#1635

#1639

#1643

#165

#165

#1660

#1662

#1670

#1673

#1687

#1688

#1689

#169

#169

#1690

#1694

#170

#170

#1701

#1722

#1724

#1728

#1741

#1744

#1746

#1760

#1765

#1767

#1769

#1779

#1780

#1785

#1797

#1799

#18

#1801

#1803

#1804

#1806

#1810

#182

#1821

#1826

#183

#183

#1830

#1838

#184

#1844

#1846

#1853

#1857

#1871

#1872

#1876

#188

#1884

#189

#1899

#19

#190

#1900

#1907

#1909

#191

#1917

#1918

#1923

#193

#1933

#1940

#1950

#1956

#1958

#196

#1967

#1969

#197

#1974

#1979

#198

#198

#1980

#1984

#1990

#1991

#1992

#1993

#1994

#1995

#200

#2002

#2004

#2008

#201

#201

#2010

#2011

#2019

#2025

#2033

#2034

#2038

#2043

#2044

#205

#2050

#2051

#2053

#2054

#206

#206

#2060

#2069

#207

#2071

#2074

#2076

#2077

#208

#2080

#2081

#209

#209

#2099

#21

#2100

#2104

#2115

#2116

#2117

#2119

#212

#212

#2121

#2123

#2125

#213

#2136

#2137

#2140

#2143

#2144

#2145

#215

#215

#2152

#2153

#2158

#2160

#2164

#2165

#2173

#2174

#2176

#2178

#218

#2181

#2182

#2183

#2193

#22

#2201

#2202

#2203

#2206

#2211

#2212

#2213

#222

#2222

#2224

#2225

#2229

#2229

#2232

#2233

#2237

#2241

#2242

#2244

#2245

#2251

#2253

#2255

#2257

#2258

#2259

#226

#2262

#2263

#2264

#2268

#2269

#227

#2273

#2274

#2279

#2282

#2283

#2285

#2287

#2288

#2288

#2294

#2297

#2299

#23

#2300

#2301

#2303

#2305

#2306

#2308

#2312

#2314

#2318

#2319

#232

#2320

#2327

#2332

#2333

#2336

#234

#234

#2344

#2347

#2349

#2352

#2354

#2357

#2363

#2364

#2367

#2375

#238

#24

#240

#240

#2405

#2406

#2411

#2414

#2415

#2417

#2418

#242

#2444

#2447

#247

#2477

#2483

#2512

#2514

#2525

#2532

#2533

#2534

#2536

#2537

#2538

#2540

#2545

#2547

#2550

#2553

#2558

#2558

#2560

#2561

#2562

#2576

#2582

#26

#2607

#2616

#2624

#2625

#2637

#2659

#266

#2673

#2677

#2679

#2683

#2685

#2687

#2688

#2688

#2689

#2690

#2693

#2693

#2707

#271

#2729

#2731

#2736

#2737

#2738

#2747

#2749

#275

#2753

#2754

#2756

#2762

#2770

#2771

#2789

#279

#2790

#2795

#2807

#2817

#2818

#2818

#2819

#2825

#2826

#2843

#2861

#2866

#2872

#2873

#2874

#2875

#2879

#2880

#2885

#2889

#2898

#29

#29

#2902

#2908

#2911

#2925

#2927

#2930

#2931

#2936

#2940

#2943

#2945

#2947

#2948

#2950

#2952

#2954

#2956

#2957

#2959

#2960

#2961

#2963

#2966

#2967

#2968

#2974

#2976

#2981

#2986

#2989

#2998

#2998

#300

#3008

#3014

#3019

#3020

#3028

#3037

#3040

#3041

#3041

#3069

#3071

#3073

#3079

#3082

#3088

#3100

#3101

#3102

#3109

#3110

#3121

#3122

#3125

#313

#3140

#3143

#3145

#3148

#3164

#3165

#3165

#318

#3181

#3193

#3194

#3199

#320

#320

#321

#3222

#3225

#3226

#3227

#3228

#3229

#3233

#3234

#3236

#3237

#324

#3240

#3244

#3246

#3247

#3248

#3249

#3265

#327

#327

#3289

#3295

#33

#3320

#3326

#3332

#3336

#3338

#334

#334

#3351

#336

#3368

#337

#337

#3370

#3375

#3378

#3379

#338

#338

#3380

#3382

#3385

#3385

#3393

#34

#34

#3405

#3415

#3416

#3417

#3418

#3420

#3421

#3422

#3423

#3426

#3427

#3431

#3437

#3439

#3440

#3440

#3442

#3442

#3444

#3446

#3450

#3450

#3451

#3452

#3454

#3456

#3462

#3463

#3464

#3465

#3466

#3478

#3479

#3481

#3485

#3487

#3493

#3498

#3499

#35

#35

#3500

#3502

#3505

#3514

#3516

#3517

#3518

#3518

#3520

#3521

#3523

#3528

#3529

#3530

#3531

#3532

#3534

#3536

#3543

#3544

#3545

#3546

#3548

#355

#355

#3550

#3553

#3554

#3554

#3555

#3557

#3564

#3565

#3569

#3571

#3572

#3575

#3575

#3577

#3577

#3580

#3581

#3585

#3586

#3590

#3592

#3593

#3596

#3599

#36

#3601

#3604

#3605

#3609

#3610

#3614

#3615

#3618

#3619

#3621

#3622

#3626

#3628

#3629

#3630

#3631

#3633

#3634

#3635

#3636

#3637

#3638

#3642

#3642

#3643

#3646

#3651

#3658

#3660

#3661

#3662

#3663

#3664

#3667

#3670

#3671

#3672

#3673

#3674

#3675

#3676

#3677

#3678

#3679

#3680

#3681

#3683

#3684

#3685

#3686

#3687

#3688

#3690

#3692

#3693

#3694

#3695

#3697

#3698

#3702

#3703

#3709

#3718

#3719

#3723

#3724

#3725

#3725

#3726

#3728

#3738

#3739

#3740

#3743

#3748

#3749

#3751

#3759

#3759

#3762

#3762

#3765

#3765

#3767

#378

#3781

#379

#379

#3790

#38

#3809

#3814

#3816

#3822

#3841

#3841

#3845

#3862

#3863

#3872

#3876

#3887

#3888

#3889

#3891

#3892

#3895

#3898

#3898

#3899

#3899

#390

#3901

#3906

#391

#3920

#3929

#3929

#3932

#3933

#3934

#3937

#395

#3950

#3951

#3964

#3965

#3966

#3969

#3972

#3975

#3978

#3981

#3985

#3988

#3996

#40

#400

#4009

#4010

#4015

#4024

#4032

#4033

#4035

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4057

#4057

#4059

#4073

#4078

#4080

#4082

#4082

#4083

#4085

#4092

#4099

#41

#41

#410

#4108

#4109

#4111

#4112

#4115

#4126

#4137

#4137

#4138

#4140

#4143

#4149

#415

#4153

#4159

#4160

#4161

#4166

#4167

#4167

#4169

#4170

#4173

#4175

#4176

#4177

#4179

#4180

#4181

#4181

#4182

#4189

#4194

#4196

#4203

#4210

#4214

#4215

#4216

#4217

#4218

#4219

#4222

#4226

#423

#423

#4230

#4231

#4232

#4233

#4237

#4255

#426

#426

#4262

#4265

#4266

#4269

#4273

#4274

#4276

#4277

#4286

#4288

#430

#4310

#4311

#4314

#4323

#4324

#4331

#4333

#4335

#4342

#4343

#4344

#4345

#4346

#435

#4353

#4353

#4356

#4356

#4362

#4364

#4365

#4366

#4368

#4372

#4375

#4380

#4385

#439

#4390

#4391

#4393

#4396

#4400

#4406

#441

#441

#4411

#4412

#4414

#4435

#4439

#4439

#4451

#4452

#4452

#4456

#4459

#4465

#4468

#4472

#4476

#4477

#4477

#4483

#4486

#4487

#4489

#4491

#4495

#4496

#4497

#4498

#4498

#450

#4500

#4502

#4504

#4505

#4506

#4508

#4509

#4512

#4513

#4516

#4517

#4520

#4521

#4522

#4522

#4523

#4524

#4525

#4526

#4526

#4528

#4531

#4531

#4532

#4533

#4536

#4537

#4539

#4540

#4541

#4542

#4543

#4544

#4545

#4546

#4547

#4548

#4549

#4550

#4551

#4553

#4555

#4555

#4557

#4558

#4560

#4562

#4563

#4563

#4565

#4566

#4567

#4570

#4572

#4573

#4574

#4575

#4577

#4579

#4580

#4581

#4582

#4583

#4584

#4585

#4587

#4587

#4588

#4590

#4591

#4592

#4594

#4595

#4597

#4600

#4601

#4602

#4603

#4604

#4605

#4606

#4607

#4608

#4609

#461

#4611

#4612

#4612

#4613

#4614

#4615

#4616

#4617

#4620

#4623

#4624

#4625

#4628

#4631

#4633

#4634

#4635

#4636

#4637

#4638

#4639

#4640

#4645

#4646

#4648

#4652

#4654

#4654

#4659

#4661

#4663

#4663

#4664

#4665

#4668

#4669

#4670

#4672

#4677

#4679

#4680

#4682

#4683

#4684

#4688

#4689

#4693

#4695

#4697

#4698

#4699

#4700

#4701

#4704

#4707

#4708

#4709

#4711

#4712

#4715

#4716

#4718

#4719

#4721

#4722

#4723

#4724

#4726

#4727

#4728

#4729

#4734

#4735

#4736

#4737

#4738

#4742

#4743

#4744

#4747

#4748

#4749

#4750

#4753

#4753

#4754

#4757

#4758

#4758

#4760

#4763

#4764

#4765

#4766

#4768

#4770

#4771

#4774

#4775

#4777

#4779

#4782

#4783

#4785

#4786

#4787

#4789

#4790

#4791

#4793

#4795

#4796

#4796

#4797

#4799

#4800

#4801

#4802

#4803

#4805

#4807

#4808

#4809

#4814

#4815

#4816

#4820

#4830

#4833

#4835

#4836

#4837

#4838

#4839

#4840

#4843

#4843

#4846

#4847

#4848

#4849

#4850

#4851

#4853

#4857

#4858

#4860

#4860

#4866

#4867

#4870

#4871

#4872

#4873

#4874

#4876

#4877

#4878

#4879

#4880

#4881

#4884

#4885

#4886

#4887

#4888

#4891

#4893

#4894

#4895

#4896

#4897

#4900

#4902

#4904

#4905

#4906

#4907

#4908

#4909

#4910

#4911

#4912

#4914

#4915

#4917

#4919

#4920

#4920

#4921

#4922

#4923

#4924

#4927

#4929

#4930

#4931

#4932

#4933

#4934

#4935

#4936

#4936

#4937

#4938

#4939

#4940

#4941

#4941

#4942

#4943

#4944

#4947

#4948

#4949

#4950

#4952

#4953

#4954

#4955

#4957

#4958

#4959

#496

#4960

#4963

#4964

#4965

#4965

#4966

#4968

#4969

#4970

#4970

#4971

#4973

#4973

#4976

#4977

#4978

#4978

#4979

#4980

#4981

#4982

#4984

#4985

#4986

#4987

#4988

#4989

#4989

#4990

#4991

#4992

#4994

#4994

#4995

#4997

#4999

#5

#5000

#5001

#5003

#5007

#5008

#5011

#5014

#5015

#5015

#5016

#5017

#5017

#5018

#5018

#5019

#5020

#5021

#5024

#5025

#5027

#5028

#5029

#5031

#5032

#5033

#5034

#5035

#5037

#5039

#5040

#5041

#5043

#5044

#5049

#5049

#5050

#5051

#5052

#5055

#5056

#5057

#5058

#5059

#5061

#5062

#5063

#5064

#5065

#5065

#5067

#5067

#508

#510

#526

#530

#532

#532

#533

#533

#534

#535

#535

#536

#540

#545

#555

#555

#560

#560

#576

#578

#579

#583

#588

#59

#594

#594

#595

#598

#6

#609

#615

#619

#619

#624

#626

#629

#63

#630

#643

#650

#652

#654

#663

#666

#669

#671

#674

#678

#679

#682

#685

#686

#687

#687

#69

#696

#696

#697

#697

#699

#699

#700

#706

#706

#708

#71

#710

#710

#72

#73

#74

#74

#749

#749

#75

#75

#753

#764

#765

#783

#785

#788

#79

#79

#793

#795

#798

#798

#807

#81

#811

#819

#819

#822

#822

#823

#823

#829

#844

#848

#848

#85

#854

#855

#856

#858

#86

#860

#862

#862

#866

#866

#868

#87

#870

#873

#875

#876

#879

#88

#88

#880

#882

#885

#890

#890

#900

#911

#915

#918

#918

#919

#922

#922

#925

#930

#936

#940

#944

#950

#954

#955

#957

#969

#978

#978

#981

#984

#984

#986

#988

#988

#989

#989

#991

#991

#992

2.0.10

2.0.8

2.0.9

2.1.0

2.1.1

3.0.0

3.0.1

3.1.0

3.1.2

3.2.0

3.3.0

3.6.1

v1.0.0

v1.0.0-rc1

v1.1.0

v2.0.0

v2.0.1

v2.0.10

v2.0.2

v2.0.3

v2.0.4

v2.0.5

v2.0.6

v2.0.7

v2.0.8

v2.0.9

v2.1.0

v2.1.1

v3.0.0

v3.0.1

v3.1.0

v3.1.1

v3.1.2

v3.10.0

v3.10.1

v3.10.2

v3.10.3

v3.10.4

v3.10.5

v3.11.0

v3.11.1

v3.11.2

v3.11.3

v3.12.0

v3.2.0

v3.3.0

v3.4.0

v3.5.0

v3.6.0

v3.6.1

v3.7.0

v3.7.1

v3.7.2

v3.7.3

v3.8.0

v3.9.0

v3.9.1

Mono Color

• 249688037f ⚗️ fix coverage Niels Lohmann 2021-07-11 09:33:43 +02:00
• 7442c24662 🚨 suppress missingReturn warnings Niels Lohmann 2021-07-10 13:44:13 +02:00
• a82f66beed 📝 document JSON_NO_IO macro #2842 Niels Lohmann 2021-07-10 12:51:18 +02:00
• 5c8d0af5ce 📝 add comment for handling of negative zeros #2854 Niels Lohmann 2021-07-10 12:50:59 +02:00
• 098bbab029 Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2021-07-06 08:46:51 +02:00
• 71fd9bd954 📝 fix documentation (#2845) Niels Lohmann 2021-07-06 08:46:17 +02:00
• b7e493e98a Specified git branch for google benchmark fetch Rafail Giavrimis 2021-06-01 13:17:53 +01:00
• 6471a63115 Merge pull request #2729 from theShmoo/without-io Niels Lohmann 2021-06-26 12:50:06 +02:00
• 624f59eacb Merge pull request #2826 from justanotheranonymoususer/patch-1 Niels Lohmann 2021-06-21 14:48:39 +02:00
• e970f31066 Update arbitrary_types.md justanotheranonymoususer 2021-06-18 12:44:27 +03:00
• c3d7fcb76c Update README.md justanotheranonymoususer 2021-06-18 11:04:53 +03:00
• 9710108d6a Consistency with using in README.md justanotheranonymoususer 2021-06-17 21:39:29 +03:00
• 572343be63 Merge branch 'nlohmann:develop' into without-io David Pfahler 2021-06-15 12:24:19 +02:00
• 18a5f4c7ca Merge pull request #2790 from nlohmann/macos_standards Niels Lohmann 2021-06-14 20:23:21 +02:00
• aa849a2275 Merge branch 'nlohmann:develop' into without-io David Pfahler 2021-06-14 08:22:49 +02:00
• 71a514a651 Merge pull request #2770 from jasmcaus/patch-1 Niels Lohmann 2021-06-14 07:18:46 +02:00
• fde6e1f800 Merge branch 'develop' of https://github.com/nlohmann/json into macos_standards Niels Lohmann 2021-06-14 07:17:47 +02:00
• 95ad4ae071 Merge pull request #2817 from nlohmann/fix_ci Niels Lohmann 2021-06-14 07:16:32 +02:00
• 802895b483 👷 remove Clang 10 Niels Lohmann 2021-06-13 14:14:10 +02:00
• 032f32ebe4 👷 add Clang 12 Niels Lohmann 2021-06-13 14:04:20 +02:00
• e939b59683 fixed amalgation file for #2728 David Pfahler 2021-05-31 14:27:23 +02:00
• ae9bbbc941 include io only if JSON_NO_IO is not set for #2728 David Pfahler 2021-05-31 14:26:45 +02:00
• 30e52eb046 👷 execute all tests Niels Lohmann 2021-05-30 13:28:58 +02:00
• 2b685c744b 👷 reduce load Niels Lohmann 2021-05-29 13:10:28 +02:00
• 9f5ee3f145 👷 fix syntax Niels Lohmann 2021-05-28 22:27:46 +02:00
• 311730bc3d 👷 add C++ standards to macOS matrix #2491 Niels Lohmann 2021-05-28 22:23:50 +02:00
• e10a3fac8a Merge pull request #2789 from TotalCaesar659/patch-2 Niels Lohmann 2021-05-28 10:31:04 +02:00
• 9a599ae63a Update URLs to HTTPS TotalCaesar659 2021-05-28 00:53:17 +03:00
• f118091eaa Update CMakeLists.txt Jason Dsouza 2021-05-15 23:39:15 +05:30
• 0972f7ff0e Merge pull request #2771 from offa/conan_package_url Niels Lohmann 2021-05-15 19:26:34 +02:00
• 7935a683f5 link to conan package in readme offa 2021-05-12 16:46:32 +02:00
• 6d7959e05d Keep consistent formatting Jason Dsouza 2021-05-12 19:25:06 +05:30
• 7cafc5c63f 📝 document Drone CI Niels Lohmann 2021-05-10 14:23:27 +02:00
• e856b50791 🔥 remove arm build Niels Lohmann 2021-05-09 14:22:46 +02:00
• a44b29ecf1 🔧 fix paths Niels Lohmann 2021-05-09 13:52:16 +02:00
• 014724f362 ⚗️ change path Niels Lohmann 2021-05-09 13:49:42 +02:00
• 0c62748b75 🔧 change repository Niels Lohmann 2021-05-09 13:46:48 +02:00
• c73bd8b251 🔧 ignore certificate Niels Lohmann 2021-05-09 13:44:21 +02:00
• 3685dbdcfd 🔧 checkout cmake via git Niels Lohmann 2021-05-09 13:41:40 +02:00
• 9746f72d71 🔨 do not check certificate Niels Lohmann 2021-05-09 13:34:28 +02:00
• df6fa6c11c 👷 arm and arm64 Niels Lohmann 2021-05-09 13:32:50 +02:00
• e6e7309514 👷 arm and arm64 Niels Lohmann 2021-05-09 13:31:27 +02:00
• 42f2512290 🔧 skip slow tests Niels Lohmann 2021-05-09 13:00:35 +02:00
• f3193e1e94 🔧 build ctest Niels Lohmann 2021-05-09 11:07:57 +02:00
• 9ec8f4efa8 🔧 fix ctest path Niels Lohmann 2021-05-09 10:39:37 +02:00
• 27a71ccdd8 🔧 fix path Niels Lohmann 2021-05-08 20:42:24 +02:00
• a6e2fd1b15 🔧 use built CMake Niels Lohmann 2021-05-08 14:41:43 +02:00
• 77a5cd247e 🔧 build cmake Niels Lohmann 2021-05-08 13:56:19 +02:00
• 1d8869f8bc 👷 add Drone CI Niels Lohmann 2021-05-08 13:33:30 +02:00
• afbb84b2c8 Add a cmake option to use SYSTEM in target_include_directories Jean-Philippe Lemieux 2021-05-05 16:19:24 -04:00
• fc2f7116fe Merge pull request #2756 from nlohmann/issue2755 Niels Lohmann 2021-05-04 12:56:46 +02:00
• b08139ea4b ♻️ replace EOF with std::char_traits<char>::eof() Niels Lohmann 2021-05-04 10:22:34 +02:00
• d4f446592f Merge pull request #2754 from mortenfyhn/patch-1 Niels Lohmann 2021-05-03 12:24:55 +02:00
• 193bf9d6b6 Fix typo in README Morten Fyhn Amundsen 2021-05-03 09:46:00 +02:00
• b2e784c33b Merge pull request #2749 from nlohmann/docs Niels Lohmann 2021-04-29 23:05:33 +02:00
• d0ab2b86c3 📝 update documentation Niels Lohmann 2021-04-29 17:19:57 +02:00
• 8a29a6ecf4 Merge pull request #2731 from theShmoo/custom-cpp-version Niels Lohmann 2021-04-29 09:55:16 +02:00
• 07344fdd09 Merge pull request #2747 from nlohmann/docs Niels Lohmann 2021-04-28 22:06:25 +02:00
• cdfe865486 📝 add documentation for numbers Niels Lohmann 2021-04-28 20:33:05 +02:00
• d140a1c777 fixed amalgamation file David Pfahler 2021-04-26 08:39:24 +02:00
• 5a77314c5e replaced define David Pfahler 2021-04-26 08:07:25 +02:00
• a34e011e24 Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers Niels Lohmann 2021-04-25 15:22:37 +02:00
• f1600cd26b Merge pull request #2737 from nlohmann/upgrade_ci Niels Lohmann 2021-04-25 15:20:42 +02:00
• f6e9654aaa 🔇 suppress unsigned integer warnings Niels Lohmann 2021-04-25 14:33:12 +02:00
• 52717b7473 👷 add clang 11 Niels Lohmann 2021-04-24 14:27:13 +02:00
• 608fbffcb1 📝 update compiler versions Niels Lohmann 2021-04-24 13:51:53 +02:00
• 0638a27ed3 👷 add step for Infer Niels Lohmann 2021-04-24 13:50:30 +02:00
• 10fc5162e7 ⬆️ use Clang 12 where available Niels Lohmann 2021-04-24 13:24:36 +02:00
• 9774e53cd6 Merge pull request #2707 from raduteo/patch-2 Niels Lohmann 2021-04-23 09:48:38 +02:00
• 0a2de2f5b9 fixed amalgation file for #2728 David Pfahler 2021-04-21 12:54:55 +02:00
• 6b267e3cb1 fixed amalgation file for #2730 David Pfahler 2021-04-21 12:53:58 +02:00
• 38952643c5 generate amalgation to fix CI for #2730 David Pfahler 2021-04-21 12:46:37 +02:00
• 31c4c8f36c Fixes #2730 David Pfahler 2021-04-21 11:03:28 +02:00
• 1a1381f071 Fixes #2728 David Pfahler 2021-04-21 10:24:01 +02:00
• 35d79203ec Update json.hpp raduteo 2021-04-12 19:47:02 -04:00
• e8dbd7be86 Update json.hpp raduteo 2021-04-09 09:35:58 -04:00
• 7126d88803 Merge pull request #2690 from doronbehar/patch-1 Niels Lohmann 2021-03-30 07:50:28 +02:00
• 53a9850eeb pkg-config.pc.in: Don't concatenate paths Doron Behar 2021-03-29 21:43:49 +00:00
• 3f33c21725 Merge pull request #2689 from nlohmann/ci_matrix Niels Lohmann 2021-03-29 09:25:04 +02:00
• d927f44576 💚 fix build Niels Lohmann 2021-03-28 15:30:37 +02:00
• 077fe41a82 🚧 do not check pushes to non-default branches Niels Lohmann 2021-03-28 14:59:42 +02:00
• ae99a31bea 🚧 add more CI tests Niels Lohmann 2021-03-28 14:48:58 +02:00
• f268035946 👷 consolidate CI Niels Lohmann 2021-03-28 13:37:04 +02:00
• 1f1fa9f30e 🔥 remove some Travis builds Niels Lohmann 2021-03-27 14:44:39 +01:00
• c591b6ca6c 👷 move some MSVC jobs from AppVeyor to GitHub Actions Niels Lohmann 2021-03-27 10:43:05 +01:00
• 5213ae56ac Merge pull request #2687 from musicinmybrain/nonconstant-sigstksz Niels Lohmann 2021-03-27 07:06:04 +01:00
• ef826b6fba Update doctest from 2.4.4 to 2.4.6 (fixes #2686) Benjamin A. Beasley 2021-03-25 13:16:04 -04:00
• 823801879a Merge pull request #2683 from nlohmann/license_fix Niels Lohmann 2021-03-25 13:04:55 +01:00
• 4a344e1ef0 Merge pull request #2375 from karzhenkov/fix-travis-release Niels Lohmann 2021-03-25 12:14:22 +01:00
• 2b865131d8 Fixing CI errors. Anthony VH 2021-03-24 23:33:21 +01:00
• 9d57351175 🐛 set correct value for JSON_ImplicitConversions in ci_test_noimplicitconversions Niels Lohmann 2021-03-24 20:27:12 +01:00
• bf75a1b91d Merge branch 'develop' into #2375 Alexander Karzhenkov 2021-03-24 13:35:38 +05:00
• 8e79917d32 Fix clang-tidy complaints. Anthony VH 2021-03-24 13:27:59 +01:00
• 41dbd50313 📄 use code from Google Abseil Niels Lohmann 2021-03-24 13:27:00 +01:00
• 322bc99d8e Reran amalgamate. Anthony VH 2021-03-24 13:03:36 +01:00
• ca9a1f2fd4 📝 add note to outdated exceptions Niels Lohmann 2021-03-24 12:46:34 +01:00
• 333612ce35 Merge remote-tracking branch 'upstream/develop' into non_default_constructable_stl_containers Anthony VH 2021-03-24 12:33:57 +01:00
• 6f551930e5 🚨 add new CI and fix warnings (#2561) Niels Lohmann 2021-03-24 07:15:18 +01:00
• 6b74772fe8 Merge pull request #2673 from remyjette/remove-exception-annotation Niels Lohmann 2021-03-23 07:48:00 +01:00
• 80e7d6fd9f Merge pull request #2679 from frasermarlow/patch-1 Niels Lohmann 2021-03-23 07:44:32 +01:00