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

• 134a5faa2b
  docs: add central repository as conan source to readme Carlos Gomes Martinho 2019-11-29 13:49:53 +0100
• 713038fa27
  💚 overwork tests Niels Lohmann 2019-11-23 14:40:15 +0100
• 1359c56137
  🏁 fix <optional> inclusion Niels Lohmann 2019-11-23 13:29:47 +0100
• c3270ac734
  Merge pull request #1853 from podsvirov/readme-msys2-package-rename Niels Lohmann 2019-11-23 09:21:52 +0100
• f586bc014f README: Package in MSYS2 renamed to nlohmann-json Konstantin Podsvirov 2019-11-23 05:02:20 +0300
• df30a0ea07
  🚧 conversions for std::optional Niels Lohmann 2019-11-23 00:21:33 +0100
• c0f52edbc3
  📝 add badges Niels Lohmann 2019-11-22 21:17:31 +0100
• a4c01f3380
  👥 add GitHub Sponsors Niels Lohmann 2019-11-22 20:58:44 +0100
• 3f044dad81
  📝 add Xocde 11.2.1 to CI list Niels Lohmann 2019-11-22 08:00:41 +0100
• 28b1448508
  👷 add Xcode 11.2.1 Niels Lohmann 2019-11-21 22:22:06 +0100
• 7439cfe5c8
  Merge pull request #1844 from Tridacnid/develop Niels Lohmann 2019-11-19 19:27:14 +0100
• b2bec943d1
  Merge pull request #1846 from Mike-Bal/fix_warnings Niels Lohmann 2019-11-19 19:24:36 +0100
• 25e0175bc3 Remove unnecessary warning suppressions in test cmake file Michael Balszun 2019-11-19 11:26:35 +0100
• 5c045f7d0a Use correct accumulator type in binary_writer if size_t != ul Michael Balszun 2019-11-19 10:52:09 +0100
• fbb0bd7556 Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747. Joe Burzinski 2019-11-18 21:45:14 -0600
• e7b3b40b5a
  Merge branch 'release/3.7.3' into develop v3.7.3 Niels Lohmann 2019-11-17 12:21:44 +0100
• 456478b3c5
  Merge branch 'release/3.7.3' Niels Lohmann 2019-11-17 12:21:32 +0100
• c5eafe74e8
  🔖 set version to 3.7.3 Niels Lohmann 2019-11-17 12:09:12 +0100
• c6e1e26018
  Merge pull request #1838 from nickaein/fix-quadratic-destruction Niels Lohmann 2019-11-15 07:02:12 +0100
• efa13c663d Reserve stack only for top-level items Isaac Nickaein 2019-11-13 15:23:08 +0330
• 948f98cf4a Cleanups Isaac Nickaein 2019-11-12 22:24:11 +0330
• 0f3ec003bb Remove harmful vector::reserve during destruction (#1837) Isaac Nickaein 2019-11-12 22:19:55 +0330
• be61ad1470
  🎨 fix inconsistent operator style Niels Lohmann 2019-11-11 21:37:32 +0100
• 411158d896
  Merge branch 'release/3.7.2' into develop v3.7.2 Niels Lohmann 2019-11-10 21:39:14 +0100
• 5f09b502b6
  Merge branch 'release/3.7.2' Niels Lohmann 2019-11-10 21:39:02 +0100
• 56109eacd7
  🔖 set version to 3.7.2 Niels Lohmann 2019-11-10 21:23:39 +0100
• 7b0c50b9a5
  🔨 add path Niels Lohmann 2019-11-10 19:09:48 +0100
• 0a513a35cb
  Merge pull request #1436 from nickaein/iterate-on-destruction Niels Lohmann 2019-11-10 11:57:06 +0100
• 7e2445a0f4 Move deep JSON test to a separate unit-test Isaac Nickaein 2019-11-09 21:42:39 +0330
• 68d0a7b246 Reduce depth in unit-test to avoid choking valgrind Isaac Nickaein 2019-11-09 21:19:12 +0330
• eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction Isaac Nickaein 2019-11-09 14:50:48 +0330
• 67259d698f
  Merge pull request #1830 from nlohmann/whitesource/configure Niels Lohmann 2019-11-08 14:04:27 +0100
• 760076abca
  Add .whitesource configuration file whitesource-bolt-for-github[bot] 2019-11-08 13:01:29 +0000
• 1a9de88117
  🚨 fix a linter warning Niels Lohmann 2019-11-07 08:00:21 +0100
• d98bf0278d
  Merge branch 'release/3.7.1' into develop v3.7.1 Niels Lohmann 2019-11-06 20:34:07 +0100
• 43e4db6141
  Merge branch 'release/3.7.1' Niels Lohmann 2019-11-06 20:33:52 +0100
• aacdc6bbe3
  🔖 set version to 3.7.1 Niels Lohmann 2019-11-06 18:37:26 +0100
• 0f6a58eeaf
  👥 update contributors Niels Lohmann 2019-11-06 17:35:04 +0100
• 1e9f16dff0
  🚨 fix linter errors Niels Lohmann 2019-11-05 20:25:53 +0100
• c0ae88bf50
  🚨 fix linter errors Niels Lohmann 2019-11-05 20:23:17 +0100
• 62dada05ca
  🐛 fix conversion to std::valarray Niels Lohmann 2019-11-05 19:28:00 +0100
• 7bcaba0ca9
  Merge pull request #1821 from AnthonyVH/develop Niels Lohmann 2019-11-05 19:15:54 +0100
• 1ca6f2901b
  Merge pull request #1826 from cbegue/develop Niels Lohmann 2019-11-05 19:14:37 +0100
• abccafa5c5
  ⬆️ upgrade Doctest to 2.3.5 Niels Lohmann 2019-11-05 19:11:54 +0100
• 2afbaacd8e Use relative path Timur Aitov 2019-11-05 15:07:29 +0300
• c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop Anthony VH 2019-11-04 20:50:43 +0100
• ec9647ae63 Moved test for #1647 regression to regressions file. Anthony VH 2019-11-04 20:45:24 +0100
• 8b686b30eb Add restriction for tuple specialization of to_json Camille Bégué 2019-10-31 18:39:01 +0100
• 3790bd9ae0
  👷 add Xcode 10.2 Niels Lohmann 2019-11-04 06:22:39 +0100
• 42e9ad32c6
  🔨 remove full path Niels Lohmann 2019-11-03 21:49:22 +0100
• e779714dd8
  👷 add Xcode 10.2 Niels Lohmann 2019-11-03 20:45:21 +0100
• bf2afaeee6
  🔊 add version output Niels Lohmann 2019-11-03 20:27:07 +0100
• 6a4cc29f01
  📝 update examples Niels Lohmann 2019-11-03 19:40:38 +0100
• dfe53c36da
  🚨 fix UBSAN warnings Niels Lohmann 2019-11-03 13:48:25 +0100
• 5e07fdff68 appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC Thomas Braun 2019-10-23 14:07:19 +0200
• 0db1692f45
  👥 update contributors Niels Lohmann 2019-11-02 10:24:06 +0100
• 1307862b1d
  Merge pull request #1694 from eli-schwartz/release-include-meson Niels Lohmann 2019-11-02 09:28:51 +0100
• 4d1e4c6d93
  Merge pull request #1780 from t-b/add-msvc-16-2019 Niels Lohmann 2019-11-02 08:16:53 +0100
• a1828bbf57
  Merge pull request #1806 from cbegue/develop Niels Lohmann 2019-11-01 19:46:19 +0100
• 794a3d411a Fix issue #1805 Camille Bégué 2019-10-21 17:50:15 +0200
• ddda67a096 Don't capture json input by value (fixed #1822). Anthony Van Herrewege 2019-10-30 16:16:34 +0100
• fb9a2643c8 Add test for #1647. Anthony Van Herrewege 2019-10-30 15:46:31 +0100
• 27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization. Anthony Van Herrewege 2019-10-30 14:54:52 +0100
• f272ad533d
  👥 add CODEOWNERS file Niels Lohmann 2019-10-23 21:41:12 +0200
• f7e7a62358
  📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER Niels Lohmann 2019-10-23 20:58:06 +0200
• 507d5676ad
  🚨 fix warning Niels Lohmann 2019-10-23 20:57:10 +0200
• 00cb98a3d1
  Merge pull request #1803 from flopp/spelling Niels Lohmann 2019-10-21 20:50:13 +0200
• 2cf7b213cc force to always compile with -Wall and -Werror in gcc/clang (and /W4, /WX in MSVC) amir 2019-10-20 21:15:08 +0330
• b93d414a35 Fix some spelling errors - mostly in comments & documentation. Florian Pigorsch 2019-10-19 11:59:46 +0200
• 935174d819
  Update README.md MR-Opz 2019-10-18 21:43:54 +0530
• f4332d4097
  README: describe how to use json as a meson subproject Eli Schwartz 2019-09-02 15:25:11 -0400
• 84faa36ec5
  release: add singleinclude and meson.build to include.zip Eli Schwartz 2019-07-31 15:43:31 -0400
• 0245ae5157
  Merge pull request #1797 from t-b/fix-integer-truncation Niels Lohmann 2019-10-17 21:02:48 +0200
• 4c06191836
  Merge pull request #1799 from nemequ/develop Niels Lohmann 2019-10-17 20:59:49 +0200
• fbcbc76d10 Update Hedley to v11. Evan Nemerson 2019-10-16 13:39:40 -0700
• c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019 Thomas Braun 2019-10-15 12:13:33 +0200
• 01e486bb55 appveyor.yml: Add MSVC 16 2019 support Thomas Braun 2019-10-07 21:36:55 +0200
• 35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int Thomas Braun 2019-10-16 20:00:05 +0200
• 5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019 Thomas Braun 2019-10-15 22:36:54 +0200
• 7a521150aa appveyor: Pass the generator platform explicitly Thomas Braun 2019-10-12 15:03:34 +0200
• ed5541440a
  Merge pull request #1779 from t-b/avoid-using-glob-in-cmake Niels Lohmann 2019-10-09 07:37:43 +0200
• e017c0f2f8 Remove <ciso646> Miguel Sacristan 2019-10-08 23:14:34 +0200
• eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB Thomas Braun 2019-10-07 21:13:09 +0200
• d187488e0d
  Merge pull request #1765 from crazyjul/fix/items-with-alt-string Niels Lohmann 2019-10-05 22:11:14 +0200
• dae0fe79af
  Merge pull request #1769 from chris0x44/json_pointer Niels Lohmann 2019-10-03 10:35:34 +0200
• d826282f53
  Merge pull request #1767 from 0xflotus/patch-1 Niels Lohmann 2019-10-01 11:32:05 +0200
• 4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function Julien Hamaide 2019-10-01 10:34:21 +0200
• 7476f5ee0c Make json_pointer::back const (resolves #1764) christian 2019-10-01 00:57:27 +0200
• d7579b8cbf
  did you mean 'serialization'? 0xflotus 2019-09-30 18:11:44 +0200
• 0f073e26eb Allow items() to be used with custom string Julien Hamaide 2019-09-26 13:13:01 +0200
• 99d7518d21
  📝 add OSS Fuzz status badge Niels Lohmann 2019-09-24 21:01:06 +0200
• e2c531a1f7
  Merge pull request #1760 from Xav83/cppcheckFixes Niels Lohmann 2019-09-24 20:42:38 +0200
• 87afee1c39 Runs make amalgamate on the project. Xav83 2019-09-19 19:25:39 +0200
• 13a7c60257 Correct a warning from cppcheck: Xav83 2019-09-19 17:58:41 +0200
• b9dfdbe6be Correct a warning from cppcheck: Xav83 2019-09-19 17:46:10 +0200
• 771d5dadc6
  Merge pull request #1741 from tete17/Fix-SFINAE Niels Lohmann 2019-09-16 22:39:42 +0200
• cade804c1a make CMake's version config file architecture-independent Hubert Chathi 2019-09-10 23:41:38 -0400
• e26a2904fc Fix and add test's for SFINAE problem Miguel Sacristan 2019-09-07 17:36:24 +0200
• 06ccd43a2a
  Merge pull request #1722 from t-b/fix-int64-min-issue Niels Lohmann 2019-09-10 07:58:02 +0200
• a6bd798bfa
  Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation Niels Lohmann 2019-09-10 07:50:02 +0200