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

• 1300d2e4c3
  Merge pull request #2908 from nlohmann/issue2863 Niels Lohmann 2021-08-14 14:27:58 +0200
• 1aceeff3fc
  🚨 fix C4244 warning Niels Lohmann 2021-08-14 13:40:52 +0200
• 0a0eb7a850
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 Niels Lohmann 2021-08-14 11:19:48 +0200
• 6ac037c1f6
  Merge pull request #2930 from nlohmann/msvc_warnings_as_error Niels Lohmann 2021-08-13 21:23:24 +0200
• e5ef44c4dd
  Merge pull request #2927 from fhuberts/fix-switch-enum Niels Lohmann 2021-08-13 19:32:39 +0200
• 4b0e04eb68
  🚨 fix C4100 warnings Niels Lohmann 2021-08-13 17:03:55 +0200
• cdbc50b9a8 Again forgot to amalgate (sigh) Ferry Huberts 2021-08-13 15:33:05 +0200
• 364a21be6b Add coverage exclusion comments, as requested Ferry Huberts 2021-08-13 15:30:55 +0200
• 78518883c9
  🚨 fix -Wextra-semi-stmt warnings Niels Lohmann 2021-08-13 15:28:40 +0200
• 79b682a438
  🚨 fix -Wextra-semi-stmt warnings Niels Lohmann 2021-08-13 15:28:31 +0200
• 312f2533a4
  🔧 remove -Wextra-semi-stmt suppression Niels Lohmann 2021-08-13 15:23:04 +0200
• 95b73bcd01 Forgot to amalgate Ferry Huberts 2021-08-13 14:22:18 +0200
• 288cdf9af7
  ⚗️ add -WX flag to MSVC builds Niels Lohmann 2021-08-13 14:07:17 +0200
• e7a69b8d31 Adjust more files after actually building like the CI Ferry Huberts 2021-08-13 13:43:51 +0200
• fecb01858b
  ⚗️ add -WX flag to MSVC builds Niels Lohmann 2021-08-13 13:28:17 +0200
• 789280fcb2
  🚨 fix C4309 warning Niels Lohmann 2021-08-13 13:20:26 +0200
• e65db83448
  ⚗️ add -WX flag to MSVC builds Niels Lohmann 2021-08-13 12:42:38 +0200
• 832cee5b77 Adjust warnings flags, as requested Ferry Huberts 2021-08-12 19:49:54 +0200
• 44d60f8d14 All: fix warnings when compiling with -Wswitch-enum Ferry Huberts 2021-08-12 16:33:41 +0200
• 910fabf8f0
  Merge pull request #2925 from nlohmann/issue2924 Niels Lohmann 2021-08-12 07:58:50 +0200
• e20f3f95eb
  🚨 guard GCC pragmas #2924 Niels Lohmann 2021-08-11 23:55:46 +0200
• 57d31d1b83
  Merge pull request #2898 from nlohmann/issue2824 Niels Lohmann 2021-08-11 13:02:49 +0200
• 8ae31a56a5
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 Niels Lohmann 2021-08-11 08:06:32 +0200
• 68d8661f1b
  📝 update documentation Niels Lohmann 2021-08-11 08:06:25 +0200
• b792bf5660
  ⚗️ try minimal example Niels Lohmann 2021-08-10 10:29:13 +0200
• 26569f8ecc
  ⚗️ try minimal example Niels Lohmann 2021-08-10 10:09:31 +0200
• edc203a837
  ⚗️ try minimal example Niels Lohmann 2021-08-10 08:35:14 +0200
• 0d530c9de8
  ⚗️ try minimal example Niels Lohmann 2021-08-10 08:22:21 +0200
• 36394cc262
  ⚗️ try minimal example Niels Lohmann 2021-08-09 21:58:05 +0200
• 83c005f881
  ⚗️ try minimal example Niels Lohmann 2021-08-09 21:43:03 +0200
• 523f7c2c9d
  💡 update documentation Niels Lohmann 2021-08-08 13:24:17 +0200
• 321cc51f62 Remove -Wfloat-equal suppressions on tests Sven Fink 2021-08-04 09:14:45 +0200
• 5b6fd51128 Add more suppressions on float comparisons Sven Fink 2021-08-04 08:34:53 +0200
• 8c6ea747c3 Supress -Wfloat-equal on intended float comparisions Sven Fink 2021-08-03 08:58:38 +0200
• 9e7550a512 📝 add note for wstring handling Niels Lohmann 2021-08-01 20:54:02 +0200
• 0c4af65d55 📄 add CITATION file Niels Lohmann 2021-08-01 12:42:59 +0200
• b83acfebe1 🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 21:12:55 +0200
• 974e38617a 🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 15:20:22 +0200
• e9797ace09 🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 14:48:25 +0200
• d9562c1075 Properly constrain the basic_json conversion operator Louis Dionne 2021-06-17 13:17:43 -0400
• a281280b7a CMake cleanup (#2885) Niels Lohmann 2021-07-22 09:25:55 +0200
• 8da9e251b7 Refactor Unicode tests (#2889) Niels Lohmann 2021-07-21 21:17:01 +0200
• 9661e66975 👥 update contributors Niels Lohmann 2021-07-19 16:57:15 +0200
• 2e82056152 ⬆️ update Doxyfile Niels Lohmann 2021-07-19 16:56:43 +0200
• 6a810733d5 🎨 reindent code Niels Lohmann 2021-07-19 16:56:28 +0200
• 7e63060008 📝 fix GIF examples #2457 Niels Lohmann 2021-07-17 14:43:01 +0200
• 740c896609 📝 add support section Niels Lohmann 2021-07-17 13:44:54 +0200
• fdb0f072cd ⚡ avoid string in case of empty objects Niels Lohmann 2021-07-16 09:27:18 +0200
• 3ff25174b2 📝 restructure README Niels Lohmann 2021-07-16 15:00:11 +0200
• fc0a1381ef 📝 update documentation Niels Lohmann 2021-07-16 14:41:14 +0200
• 1f1b6a700b ✅ add test for JSON_SystemInclude flag Niels Lohmann 2021-07-16 12:34:15 +0200
• 8e077ae8f1 Add a cmake option to use SYSTEM in target_include_directories Jean-Philippe Lemieux 2021-05-05 16:19:24 -0400
• 95384542b7 👷 fix Codacity badge Niels Lohmann 2021-07-16 11:44:07 +0200
• d65ee13803 🚨 suppress warning Niels Lohmann 2021-01-26 20:53:02 +0100
• 2668c896c0 🚨 fix format-truncation warning #2572 Niels Lohmann 2021-01-15 17:01:47 +0100
• 2d994d9452 🔨 remove noexcept annotation Niels Lohmann 2021-07-15 21:49:09 +0200
• 94e87ff6af 💡 add comment to describe j.m_value.destroy(j.m_type) calls Niels Lohmann 2021-07-15 20:34:50 +0200
• 519dcc5029 🐛 fix leak for all types Niels Lohmann 2021-07-15 20:32:37 +0200
• 3675770d22 🐛 fix leak for strings Niels Lohmann 2021-07-15 13:12:21 +0200
• 88ea375f39 🐛 fix leak for strings Niels Lohmann 2021-07-15 13:03:20 +0200
• 16758b933b 🐛 fix leak for strings Niels Lohmann 2021-07-15 12:52:17 +0200
• 5bbbe5fbfa 🐛 fix leak for strings Niels Lohmann 2021-07-15 12:47:15 +0200
• e77ae77d7e ♻️ simplify destroy() function for primitive types Niels Lohmann 2021-07-15 12:46:48 +0200
• 97eb6414e4 ✅ add regression test Niels Lohmann 2021-07-15 09:02:24 +0200
• 8b643e4362 🚨 fix warnings Niels Lohmann 2021-07-13 15:37:57 +0200
• 45c77b1c72 ♻️ move capacity check to set_parent function Niels Lohmann 2021-07-13 15:27:27 +0200
• 44a7dceb04 🔥 remove duplicated line Niels Lohmann 2021-07-12 19:21:07 +0200
• a5fd035506 🐛 fix logics Niels Lohmann 2021-07-12 15:24:06 +0200
• 714d9f56f8 🐛 fix assertion failure #2838 Niels Lohmann 2021-07-12 13:38:28 +0200
• 23803e267a Specified git branch for google benchmark fetch Rafail Giavrimis 2021-06-01 13:17:53 +0100
• a4c9fa06ec ⚗️ fix coverage Niels Lohmann 2021-07-11 09:33:43 +0200
• 3363fc8aab 🚨 suppress missingReturn warnings Niels Lohmann 2021-07-10 13:44:13 +0200
• 1d7639a6f6 📝 document JSON_NO_IO macro #2842 Niels Lohmann 2021-07-10 12:51:18 +0200
• b475990b00 📝 add comment for handling of negative zeros #2854 Niels Lohmann 2021-07-10 12:50:59 +0200
• eeb48dd0a7 fixed amalgation file for #2728 David Pfahler 2021-05-31 14:27:23 +0200
• 5a499323a2 include io only if JSON_NO_IO is not set for #2728 David Pfahler 2021-05-31 14:26:45 +0200
• 378fbda911 fixed amalgation file for #2728 David Pfahler 2021-04-21 12:54:55 +0200
• 6c99b750da Fixes #2728 David Pfahler 2021-04-21 10:24:01 +0200
• 69de3eb786 📝 fix documentation (#2845) Niels Lohmann 2021-07-06 08:46:17 +0200
• 44201db12b Update arbitrary_types.md justanotheranonymoususer 2021-06-18 12:44:27 +0300
• 7ea27324c0 Update README.md justanotheranonymoususer 2021-06-18 11:04:53 +0300
• a5104d1229 Consistency with using in README.md justanotheranonymoususer 2021-06-17 21:39:29 +0300
• db7ccafbda
  💚 fix MSVC build Niels Lohmann 2021-08-07 13:55:25 +0200
• a4c3cf7798
  💚 fix MSVC build Niels Lohmann 2021-08-07 13:40:01 +0200
• 346c9c1a19
  💚 fix MSVC build Niels Lohmann 2021-08-07 13:37:17 +0200
• c5928501b0
  💚 fix MSVC build Niels Lohmann 2021-08-07 13:19:25 +0200
• 176e9bf0ab
  ✅ add tests for CBOR Niels Lohmann 2021-08-07 13:14:08 +0200
• b74474e3fd
  💚 fix MSVC build Niels Lohmann 2021-08-07 13:14:00 +0200
• 89c98dfc20
  ✨ add option to process binary subtypes in CBOR Niels Lohmann 2021-08-06 16:41:01 +0200
• 51a9880022
  ✅ add tests for CBOR Niels Lohmann 2021-08-06 15:31:11 +0200
• b7db1d68d9
  ♻️ fix CBOR and BSON Niels Lohmann 2021-08-06 14:36:38 +0200
• 046df035fa
  ♻️ change type of binary subtype Niels Lohmann 2021-08-06 13:45:35 +0200
• 3eb1fb6be7
  ♻️ change type of binary subtype Niels Lohmann 2021-08-06 13:26:00 +0200
• 5c38e76c11
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 Niels Lohmann 2021-08-06 13:23:26 +0200
• 359f6723fc
  Merge pull request #2911 from Finkman/develop Niels Lohmann 2021-08-06 12:58:34 +0200
• 3f5545f99b Remove -Wfloat-equal suppressions on tests Sven Fink 2021-08-04 09:14:45 +0200
• 353d59717e Add more suppressions on float comparisons Sven Fink 2021-08-04 08:34:53 +0200
• 095aae19fe Supress -Wfloat-equal on intended float comparisions Sven Fink 2021-08-03 08:58:38 +0200
• 7c19aa2210
  ♻️ overwork byte_container_with_subtype Niels Lohmann 2021-08-01 22:00:57 +0200
• eb488bb4d9
  📝 add note for wstring handling Niels Lohmann 2021-08-01 20:54:02 +0200