Commit Graph

Select branches

Hide Pull Requests

bon8

clang-format

coverity_scan

develop

feature/optional

gh-pages

issue2228

issue2615

master

update_doctest_2.4.9

#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

#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

#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

#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

#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

#4015

#4024

#4032

#4033

#4033

#4035

#4035

#4036

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4056

#4057

#4057

#4059

#4073

#4078

#4080

#4082

#4082

#4083

#4085

#4092

#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

#4210

#4214

#4214

#4215

#4216

#4217

#4218

#4219

#4222

#4226

#4226

#423

#423

#4230

#4231

#4232

#4233

#4233

#4237

#4255

#4255

#426

#426

#4262

#4262

#4265

#4266

#4269

#4273

#4274

#4276

#4277

#4286

#4288

#430

#435

#439

#441

#441

#450

#461

#496

#5

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

• c7440a6da2
  Merge branch 'develop' of https://github.com/nlohmann/json into bon8 Niels Lohmann 2021-09-01 20:49:24 +0200
• bbdb29c658
  Update docset generation script (#2967) Niels Lohmann 2021-09-01 08:43:10 +0200
• f0d65f6d8d
  Merge branch 'develop' of https://github.com/nlohmann/json into docset Niels Lohmann 2021-08-31 22:45:32 +0200
• 03be1f1f33
  📝 update documentation Niels Lohmann 2021-08-31 22:44:58 +0200
• f656f535e1
  🚧 begin BON8 implementation Niels Lohmann 2021-08-31 15:04:06 +0200
• 5b93e7640c
  ♻️ allow allocators for vectors Niels Lohmann 2021-08-30 18:04:35 +0200
• 8b9e2975c2
  🔀 merge develop Niels Lohmann 2021-08-30 17:35:14 +0200
• d15ad85203
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-08-30 17:34:31 +0200
• fd0aa4fb0d
  👷 re-add Clang 12 (#2986) Niels Lohmann 2021-08-30 10:54:14 +0200
• a96474827d
  👷 re-add Clang 12 Niels Lohmann 2021-08-30 08:22:23 +0200
• e0b02c355e
  Use new Docker image (#2981) Niels Lohmann 2021-08-29 18:05:31 +0200
• 886ffae046
  🔧 adjust flags Niels Lohmann 2021-08-29 13:52:56 +0200
• a1effcb7e8
  🔧 adjust flags Niels Lohmann 2021-08-29 13:33:33 +0200
• 796c8a8754
  📌 pin image to version Niels Lohmann 2021-08-29 13:16:17 +0200
• 0b4df0d0ee
  👷 use Docker image from GitHub Niels Lohmann 2021-08-29 13:08:06 +0200
• 9dfd91695c
  Merge branch 'release/3.10.2' into develop Niels Lohmann 2021-08-26 09:08:33 +0200
• 626e7d61e4
  Merge branch 'release/3.10.2' v3.10.2 Niels Lohmann 2021-08-26 09:08:14 +0200
• 33b674b4b2
  🔖 set version to 3.10.2 Niels Lohmann 2021-08-26 08:13:04 +0200
• 28a169725e
  Fix -Wunused warnings on JSON_DIAGNOSTICS (#2976) Giovanni Cerretani 2021-08-26 07:35:01 +0200
• 9325ffbe00 amalgamated Giovanni Cerretani 2021-08-25 18:10:11 +0200
• d77da05c17
  Fix #2975 Giovanni Cerretani 2021-08-25 17:25:27 +0200
• a42e3383c2 amalgamated Jonas Wittbrodt 2021-08-25 16:49:10 +0200
• f8db74f4c3 another try to hit that uncovered line Jonas Wittbrodt 2021-08-25 15:56:59 +0200
• 48d130d575 add <limits> Jonas Wittbrodt 2021-08-25 15:50:59 +0200
• 3dce62b5f7 fix clang-tidy else after return Jonas Wittbrodt 2021-08-25 15:31:09 +0200
• 75bd0a8762 fix shadow in test Jonas Wittbrodt 2021-08-25 14:33:18 +0200
• 9fcc695481 add test for numeric arrays with null Jonas Wittbrodt 2021-08-25 14:28:10 +0200
• 7085630ad0 fix fallthrough warnings Jonas Wittbrodt 2021-08-25 14:27:53 +0200
• 0f0be71952 amalgamated Jonas Wittbrodt 2021-08-25 13:53:28 +0200
• 7c1bfbe735 switch signaling<>quiet NaN Jonas Wittbrodt 2021-08-25 13:25:18 +0200
• 5c3738b9b1 add explicit conversion of null into float NaN Jonas Wittbrodt 2021-08-25 12:53:49 +0200
• 1fd2213fd2
  Merge branch 'release/3.10.1' into develop Niels Lohmann 2021-08-24 21:08:43 +0200
• b488724ecd
  Merge branch 'release/3.10.1' Niels Lohmann 2021-08-24 21:08:29 +0200
• 8ad66e9136
  🔖 set version to 3.10.1 Niels Lohmann 2021-08-24 20:19:55 +0200
• 7194245a31
  Fixed typo in parse.md (#2968) v3.10.1 mb0202 2021-08-24 02:08:02 -0400
• 8d791b139e
  Fixed typo in parse.md mb0202 2021-08-23 23:00:22 -0400
• 7af084038d
  📝 update docset generation script Niels Lohmann 2021-08-23 17:02:20 +0200
• 34e2c4ab88
  📝 add link to Homebrew package (#2966) Niels Lohmann 2021-08-22 21:58:37 +0200
• 0341f508a2
  📝 add link to Homebrew package Niels Lohmann 2021-08-22 21:00:13 +0200
• c753165db6
  Fix parent update for diagnostics with ordered_json (#2963) Niels Lohmann 2021-08-22 20:30:20 +0200
• 200015cb0e
  🚨 suppress warnings Niels Lohmann 2021-08-22 17:56:28 +0200
• f03127eb69
  Set stack size for some unit tests when using MSVC (#2961) Niels Lohmann 2021-08-21 13:55:06 +0200
• a78764d44a
  🐛 fix parent update for diagnostics with ordered_json Niels Lohmann 2021-08-20 21:43:05 +0200
• 01daa32621
  🏁 set stack size for some unit tests Niels Lohmann 2021-08-20 17:43:21 +0200
• ebf3a80069
  🏁 set stack size for some unit tests Niels Lohmann 2021-08-20 16:40:24 +0200
• cb053bceb1
  Merge pull request #2960 from nlohmann/issue2958 Niels Lohmann 2021-08-20 16:34:38 +0200
• e680154336
  🏁 set stack size for some unit tests Niels Lohmann 2021-08-20 16:07:15 +0200
• 97c7a35a2b
  ✅ add regression test Niels Lohmann 2021-08-20 14:49:58 +0200
• eb6541a30c
  Merge pull request #2959 from nlohmann/issue2938 Niels Lohmann 2021-08-20 13:56:16 +0200
• e8e93ee43b
  👷 update Travis badge Niels Lohmann 2021-08-20 13:53:31 +0200
• a653131cf0
  🚨 fix warnings Niels Lohmann 2021-08-20 13:42:49 +0200
• 611fd22557
  Merge pull request #2957 from Hallot/bug/fix-some-clang-warnings Niels Lohmann 2021-08-20 13:32:38 +0200
• 433604843d
  Fix extra ";" clang warnings Pierre Hallot 2021-08-19 17:04:34 +0200
• 83c930db2b
  ♻️ fix regression test Niels Lohmann 2021-08-19 16:29:50 +0200
• 5e527c4521
  🚨 add missing includes Niels Lohmann 2021-08-19 16:18:35 +0200
• 40483ddadb
  ✨ allow std::unordered_map as ObjectType Niels Lohmann 2021-08-19 16:08:05 +0200
• 44ffaa052c
  Merge pull request #2943 from amirmasoudabdol/patch-1 Niels Lohmann 2021-08-19 12:03:52 +0200
• 14af5d4a9f fixing the doc files Amir Masoud Abdol 2021-08-19 09:31:39 +0200
• 273d911252
  Merge pull request #2954 from nlohmann/issue2944 Niels Lohmann 2021-08-19 06:37:42 +0200
• 55281e03af
  📝 add documentation for integration via vcpkg Niels Lohmann 2021-08-18 21:25:23 +0200
• 23e3b622aa
  📝 add documentation for integration via vcpkg Niels Lohmann 2021-08-18 20:49:13 +0200
• abd829e6c6
  Merge pull request #2950 from senyai/patch-2 Niels Lohmann 2021-08-18 20:07:28 +0200
• 5cf5ccd108
  Merge pull request #2948 from nlohmann/missing_header Niels Lohmann 2021-08-18 20:07:05 +0200
• 5a04042cad
  Merge pull request #2947 from nlohmann/issue2946 Niels Lohmann 2021-08-18 20:06:44 +0200
• f8bc22c741
  Merge pull request #2945 from nlohmann/issue2941 Niels Lohmann 2021-08-18 20:06:00 +0200
• de4a6346c7
  Merge pull request #2952 from nlohmann/fewer_appveyor_builds Niels Lohmann 2021-08-18 20:04:25 +0200
• f79bed6d39
  👷 avoid duplicate AppVeyor builds Niels Lohmann 2021-08-18 19:53:35 +0200
• 355fa6c35c
  🚨 gdb_pretty_printer failure on basic types Arseniy Terekhin 2021-08-18 19:29:50 +0300
• b65748f763
  Using the homebrew/core Formula Amir Masoud Abdol 2021-08-18 16:49:51 +0200
• cfb71ad1bf
  🐛 adding missing header Niels Lohmann 2021-08-18 13:33:35 +0200
• 54d9cd5a12
  🔧 guard tests with JSON_Install flag Niels Lohmann 2021-08-18 13:24:12 +0200
• 5d3ad31d7e
  🔥 remove outdated json_unit binary Niels Lohmann 2021-08-18 12:41:03 +0200
• 8e4996c156
  Updating the Homebrew Command Amir Masoud Abdol 2021-08-18 11:55:25 +0200
• c73b8f180e Build Config Ankit Kumar 2021-08-18 13:05:28 +0530
• 6496e13b07
  Merge branch 'develop' into coverity_scan coverity_scan Niels Lohmann 2021-08-17 20:55:25 +0200
• f42a74b8f5
  Merge branch 'release/3.10.0' into develop v3.10.0 Niels Lohmann 2021-08-17 20:40:42 +0200
• 0b7471b0f7
  Merge branch 'release/3.10.0' Niels Lohmann 2021-08-17 20:40:25 +0200
• 1de378f580
  🔖 set version to 3.10.0 Niels Lohmann 2021-08-17 15:23:23 +0200
• 8cae9d7cd2
  Overwork warning flags (#2936) Niels Lohmann 2021-08-17 14:43:43 +0200
• c232ac39c0
  ⚗️ update warning flags Niels Lohmann 2021-08-17 12:03:35 +0200
• 57dd00f410
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:52:08 +0200
• bfeac776b9
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:42:20 +0200
• 49f78e0e15
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:38:27 +0200
• 3d392520e4
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:36:26 +0200
• 636091bbc9
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:32:47 +0200
• 6d7795396f
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:28:11 +0200
• 23c79b0fc3
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:21:18 +0200
• c9505dba50
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:15:44 +0200
• aa536f3379
  ⚗️ update warning flags Niels Lohmann 2021-08-17 11:08:46 +0200
• 7a0121381d
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:58:02 +0200
• b30065bc5f
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:51:41 +0200
• efff8c2d1b
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:49:42 +0200
• efbfc25562
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:42:57 +0200
• af5355df1e
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:34:42 +0200
• 20aaf33c6c
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:32:18 +0200
• e3206b0bb8
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:25:03 +0200
• 568fad2925
  ⚗️ update warning flags Niels Lohmann 2021-08-17 10:21:39 +0200
• f1e63a8322
  👷 run CI for release branches Niels Lohmann 2021-08-16 15:40:57 +0200
• fa5d3b5a9b
  👷 run CI for release branches Niels Lohmann 2021-08-15 22:49:31 +0200
• 09237272bc
  👥 update documentation Niels Lohmann 2021-08-15 21:05:26 +0200