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

• 71830be06d fix issue#1275 chenguoping 2020-06-10 19:27:28 +0800
• 27f5a6e827
  🙈 ignore __pycache__ directory Niels Lohmann 2020-06-09 16:59:03 +0200
• 262d9cc67d
  🚨 fix a maybe-uninitialized warning Niels Lohmann 2020-06-09 16:57:06 +0200
• 14881cf901
  Merge pull request #2178 from nlohmann/input_adapter_tests Niels Lohmann 2020-06-09 08:46:32 +0200
• ae04426c85
  🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) Niels Lohmann 2020-06-08 20:07:15 +0200
• 2cf16625ac
  ✅ add test for character types Niels Lohmann 2020-06-07 22:49:39 +0200
• d4bc0c39af
  ✅ add test for character types Niels Lohmann 2020-06-07 22:47:54 +0200
• 6d73126ea9
  🚨 fix warnings Niels Lohmann 2020-06-07 22:47:25 +0200
• 28048d8207
  Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-06-07 21:02:08 +0200
• eca5490b94
  📝 add example link for swap function Niels Lohmann 2020-06-07 21:01:13 +0200
• 8c1d26e186
  📝 add documentation and example for accept function Niels Lohmann 2020-06-07 20:59:43 +0200
• 543dcee3a7
  Merge pull request #2174 from nlohmann/fix_warnings Niels Lohmann 2020-06-07 20:35:05 +0200
• 907803189b
  🏁 fix MSVC 2015 compilation Niels Lohmann 2020-06-07 12:51:33 +0200
• e6a7e7a16a
  🚑 hotfix for #2177 Niels Lohmann 2020-06-07 12:41:36 +0200
• 0afebec774 Added complete data and renamed files and fuzzer Tanuj Garg 2020-06-06 19:55:37 +0530
• d402b6a167 [Checking stats] resolved compiler error Tanuj Garg 2020-06-06 01:28:56 +0530
• 88194fd520 [Checking stats] Keeping only parsing vector Tanuj Garg 2020-06-06 01:21:27 +0530
• a94e1af71c [Checking stats] Keeping json map iteration Tanuj Garg 2020-06-06 01:04:43 +0530
• f1f38cf908 [Checking stats] keeping only stl like operations Tanuj Garg 2020-06-06 00:45:03 +0530
• f3c7022487 [Checking stats] Keeping only map coversions to json Tanuj Garg 2020-06-05 23:55:50 +0530
• 2cd43525ea [Checking stats] resolved compile error Tanuj Garg 2020-06-05 23:38:18 +0530
• 02c901ef11 [Checking stats] Keeping only stl like operations on json vector Tanuj Garg 2020-06-05 23:33:49 +0530
• c06ee977f4 [Checking stats] Keeping only iterating a json vector container Tanuj Garg 2020-06-05 22:50:40 +0530
• 6e81c78545 [Checking stats] Keeping only conversion from stl containers Tanuj Garg 2020-06-05 22:14:32 +0530
• 2efdbfa315 removed deque parsing because deque is not a contiguous byte sequence when it has large data Tanuj Garg 2020-06-03 13:46:28 +0530
• 35ac9319c8 resolved all warnings Tanuj Garg 2020-06-03 00:20:47 +0530
• 5c51ebb874 initialized json with empty array to test push_back & emplace_back methods Tanuj Garg 2020-06-01 14:28:57 +0530
• 9388bb2627 changed datatype of key in maps from uint8_t to std::string Tanuj Garg 2020-06-01 13:56:11 +0530
• 5868e7f289 added looping in vector & map, and tested get(), push_back() & emplace_back() methods Tanuj Garg 2020-06-01 12:32:11 +0530
• 57c8851439 added parsing from vector and deque Tanuj Garg 2020-06-01 09:55:01 +0530
• c66806b8bc removed namespace bug Tanuj Garg 2020-06-01 09:29:04 +0530
• 74a04708cf Added conversion from various maps to json Tanuj Garg 2020-06-01 09:14:53 +0530
• 5d501bf7e3 added conversion from other stl sequence containers to json added Tanuj Garg 2020-05-30 19:32:19 +0530
• 35ce214901 fuzzer, testing conversion from vector & deque to json, added Tanuj Garg 2020-05-30 01:26:16 +0530
• def05d0ad1 [Experiment] temp fuzzer removed Tanuj Garg 2020-05-29 22:35:31 +0530
• 651fb03be0 [Experiment] renamed again for confirmation Tanuj Garg 2020-05-29 01:50:55 +0530
• b95ca37aff [Experiment] changed name of test fuzzer Tanuj Garg 2020-05-29 01:44:30 +0530
• a90ff95ab5 [Experiment] corrected a typo in makefile Tanuj Garg 2020-05-29 01:08:36 +0530
• cd36c9b557 [Experiment] edited makefiles to include test fuzzer Tanuj Garg 2020-05-29 01:05:25 +0530
• f829e72bd0 [Experiment] added a test fuzzer Tanuj Garg 2020-05-29 00:58:22 +0530
• 82fbbeeac5 Adapted unit tests to use ADL calls for swap like the new swappable concept Guillaume Racicot 2020-06-06 12:28:52 -0400
• 225c8f150a Disable std::swap specialization in C++20 and added a friend swap function Guillaume Racicot 2020-06-06 11:36:39 -0400
• bf2e714e96
  🚨 fix warnings Niels Lohmann 2020-06-06 14:30:17 +0200
• a3fe169910 removed dev code Francois Chabot 2020-06-05 16:39:36 -0400
• f072b97eb2 use the current fill char when piping to a stream Francois Chabot 2020-06-05 16:30:21 -0400
• bf55a999c5 templatized output adapters Francois Chabot 2020-06-05 16:15:36 -0400
• 7444c7fa25
  Merge pull request #2145 from FrancoisChabot/1813-user-input Niels Lohmann 2020-06-05 14:30:39 +0200
• dd7e25927f
  🚨 fix warning Niels Lohmann 2020-06-05 08:27:15 +0200
• 5fe6b83c26
  Merge pull request #2158 from dota17/output_adapter Niels Lohmann 2020-06-05 08:25:19 +0200
• ad2b4ff23b recover original blank line chenguoping 2020-06-05 14:23:00 +0800
• 0f67c5849f undo: remove comment chenguoping 2020-06-05 10:09:15 +0800
• dbbdce4671 add user-defined build option in CMake chenguoping 2020-06-04 21:23:07 +0800
• 0e93f81ba4 add clang support in JSON_HAS_CPP_17 macro chenguoping 2020-06-04 20:18:41 +0800
• 2df5f107a9
  📝 add page on parsing and exceptions Niels Lohmann 2020-06-04 14:01:57 +0200
• 32bda1a7af
  Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-06-04 13:07:20 +0200
• 24e8562664
  👷 remove Clang 8 Niels Lohmann 2020-06-04 12:48:03 +0200
• a53e3a5443
  👷 try Clang 8 Niels Lohmann 2020-06-04 12:34:56 +0200
• dc323314d5
  👷 try Clang 10 Niels Lohmann 2020-06-04 12:29:53 +0200
• 402c34c526
  👷 try Clang 10 Niels Lohmann 2020-06-04 12:27:37 +0200
• 65c4b07451
  🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 21:22:07 +0200
• 0498202a03
  🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 14:20:36 +0200
• 4f04ea1bef
  Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-06-03 14:01:18 +0200
• 9212590764
  👥 update contributor list Niels Lohmann 2020-06-03 13:56:01 +0200
• 9708b1e9c3
  🔥 remove Code Inspector Niels Lohmann 2020-06-03 13:49:46 +0200
• 68fd772fdf
  👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:44:33 +0200
• 9bc2a7fa25
  👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:39:56 +0200
• c24218afe8
  Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-06-03 13:38:15 +0200
• 2c4be7d65c
  Merge pull request #2152 from TotalCaesar659/patch-1 Niels Lohmann 2020-06-03 12:31:33 +0200
• 2ad847f21b
  🔨 fix doxygen link Niels Lohmann 2020-06-03 12:30:42 +0200
• fdf5a63dfd
  🔨 fix Doxygen link Niels Lohmann 2020-06-03 12:30:10 +0200
• 309acb445a
  Merge pull request #2153 from dota17/issue#1972 Niels Lohmann 2020-06-03 12:26:17 +0200
• eca4b8785c fix test case in PR#1006 chenguoping 2020-06-02 15:44:26 +0800
• fff1499963 add comment about PR#1006 chenguoping 2020-06-02 15:43:57 +0800
• 8cd39578e3 add test case chenguoping 2020-06-01 11:34:03 +0800
• 5ea205f570
  👷 install clang Niels Lohmann 2020-05-30 18:17:54 +0200
• 5f10d5d156
  👷 install clang Niels Lohmann 2020-05-30 18:15:13 +0200
• 7c0c522b96
  👷 install clang Niels Lohmann 2020-05-30 18:11:54 +0200
• 522ec5d7bd
  👷 install clang Niels Lohmann 2020-05-30 18:06:52 +0200
• 7e5c2a480a
  👷 install clang Niels Lohmann 2020-05-30 18:04:07 +0200
• 9c971c2d2f
  👷 install clang Niels Lohmann 2020-05-30 17:40:27 +0200
• 4ba8c95794
  👷 install clang Niels Lohmann 2020-05-30 13:41:18 +0200
• fbd3e8f677
  👷 install clang Niels Lohmann 2020-05-30 13:35:19 +0200
• 0309025b45
  👷 set full path Niels Lohmann 2020-05-30 13:28:44 +0200
• 9191926fff
  👷 use Makefiles Niels Lohmann 2020-05-30 13:23:13 +0200
• 42ef2a5adb
  👷 use Clang compiler Niels Lohmann 2020-05-30 13:15:56 +0200
• 2182935397
  👷 add Clang/Windows step Niels Lohmann 2020-05-30 13:07:23 +0200
• 4350c5ed97 fix bug in issue#1972 chenguoping 2020-05-30 17:15:56 +0800
• 0aa13599f0
  Update URLs to HTTPS TotalCaesar659 2020-05-30 06:02:25 +0300
• 0da131d717 minor readme correction Francois Chabot 2020-05-28 17:12:26 -0400
• b715a70673 changed macro order to satisfy clang Francois Chabot 2020-05-28 12:26:29 -0400
• 7646253940 fix inconsistent fwd declaration Francois Chabot 2020-05-28 12:20:02 -0400
• ce3143a038 use correct deprecation macro Francois Chabot 2020-05-28 12:16:10 -0400
• d575534471 brought back the from_*(ptr, len) syntax with a deprecation warning Francois Chabot 2020-05-28 12:13:43 -0400
• 248f310215 cleaned up custom iterator example Francois Chabot 2020-05-28 10:14:55 -0400
• 897061c434 amalgamate Francois Chabot 2020-05-28 10:11:19 -0400
• 7ceb06baac Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input Francois Chabot 2020-05-28 09:30:07 -0400
• dcf6175978 use the correct convention for boolean operators Francois Chabot 2020-05-28 09:29:38 -0400
• 23c8ab95da
  👥 update contributor list Niels Lohmann 2020-05-28 14:24:08 +0200
• 53ef076715
  🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 13:46:56 +0200
• 2edb5cb999
  👷 fix -DJSON_BuildTests=On parameter placement Niels Lohmann 2020-05-28 13:46:47 +0200