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

• 6fc779005c fix ci_test errors Qianqian Fang 2022-02-18 17:22:38 -0500
• 42701cc2fc gcc warn useless conversion but msvc gives an error Qianqian Fang 2022-02-18 15:32:30 -0500
• c8752b349f add tests for optimized ndarray, improve coverage, fix clang/gcc warnings Qianqian Fang 2022-02-18 15:22:19 -0500
• 55682ffb5a add more tests to cover the new bjdata types Qianqian Fang 2022-02-17 23:49:24 -0500
• 4985323bb7 fix additional warnings and errors for clang and msvc Qianqian Fang 2022-02-17 11:11:36 -0500
• 76ee885fd2 fix more VS compilation errors Qianqian Fang 2022-02-17 01:11:24 -0500
• 58efde83f0 fix additional VS errors Qianqian Fang 2022-02-17 00:40:52 -0500
• 94b0268cc2 partially fix VS compilation errors Qianqian Fang 2022-02-17 00:21:34 -0500
• 02d8f926f0 fix Codacy warning Qianqian Fang 2022-02-16 22:50:15 -0500
• 3c820dd215 support UBJSON-derived Binary JData (BJData) format Qianqian Fang 2022-02-16 18:05:31 -0500
• 48af996d90
  Merge branch 'develop' of https://github.com/nlohmann/json into overwork_documentation Niels Lohmann 2022-04-22 20:39:41 +0200
• 1a90c9463a
  Disable regression test for #3070 on GCC <8.4 (#3451) Florian Albrechtskirchinger 2022-04-22 14:21:16 +0200
• 7cd3120e7f Disable regression test for #3070 on GCC <8.4 Florian Albrechtskirchinger 2022-04-22 11:45:12 +0200
• 90be3582e8
  📝 overwork macro documentation Niels Lohmann 2022-04-18 16:07:23 +0200
• b94e90e66e
  📝 overwork macro documentation Niels Lohmann 2022-04-17 15:23:00 +0200
• 03a5483533
  📝 overwork macro documentation Niels Lohmann 2022-04-16 22:43:11 +0200
• 551b516255
  Merge branch 'develop' of https://github.com/nlohmann/json into overwork_documentation Niels Lohmann 2022-04-16 22:33:17 +0200
• 169e1da4b0
  📝 overwork macro documentation Niels Lohmann 2022-04-16 22:33:06 +0200
• f4a8d2d97f tidying up code, no change to logic Luca 2022-04-14 14:35:55 +0200
• 358970e3d0 fix iterator_input_adapter consuming input before it should Luca 2022-04-14 13:00:52 +0200
• edf4b3e82e code refactoring, common sax_interface for all sax Luca 2022-04-13 02:42:48 +0200
• df1abddfd9 added support for varius key types in msgpack, added key types: null, bool, unsigned, integer Luca 2022-04-12 21:42:26 +0200
• 07571ed4be added support for varius key types in msgpack, added key types: null, bool, unsigned, integer Luca 2022-04-12 21:42:26 +0200
• a94430615d
  Fix typo in basic_json documentation (#3439) JungHoon Lee 2022-04-12 22:58:06 +0900
• 9252772a83 Fix typo in basic_json documentation jhnlee 2022-04-12 22:27:17 +0900
• 616caea27a
  Re-template json_pointer on string type (#3415) Florian Albrechtskirchinger 2022-04-12 14:18:16 +0200
• 1deeb434c6
  Exclude std::any from implicit conversion (fixes #3428) (#3437) Florian Albrechtskirchinger 2022-04-12 14:08:20 +0200
• a41b003a3a Exclude std::any from implicit conversion Florian Albrechtskirchinger 2022-04-12 09:16:53 +0200
• 6ea011f2b6 Exclude std::any from implicit conversion Florian Albrechtskirchinger 2022-04-12 07:34:16 +0200
• 10344907ff
  📝 document which version introduced the macros #3429 (#3431) Niels Lohmann 2022-04-09 18:09:23 +0200
• fdb15f956f Update version numbers Florian Albrechtskirchinger 2022-04-08 11:51:25 +0200
• 261cc4e509
  Fix constraints on from_json() for strings (#3427) Florian Albrechtskirchinger 2022-04-08 10:22:47 +0200
• e9c8d5c4a2
  📝 document which version introduced the macros #3429 Niels Lohmann 2022-04-08 10:18:02 +0200
• ebab61ecd3 Fix constraints on from_json() for strings Florian Albrechtskirchinger 2022-04-06 14:57:03 +0200
• f5f975a48c Allow comparing different json_pointers Florian Albrechtskirchinger 2022-04-05 14:57:10 +0200
• 03dbf3ed97 Update json_pointer docs Florian Albrechtskirchinger 2022-04-05 06:39:54 +0200
• 38f251f158 Add backwards compatibility with json_pointer<basic_json> Florian Albrechtskirchinger 2022-04-04 12:03:01 +0200
• 6f319322ac Fix regression test for #2958 Florian Albrechtskirchinger 2022-04-03 19:26:04 +0200
• 067c473a2d Add unit test for #3388 Florian Albrechtskirchinger 2022-04-03 18:37:05 +0200
• 4092fb0c4f Template json_pointer on string type Florian Albrechtskirchinger 2022-04-03 11:38:32 +0200
• ddd60f2092 Replace string concatenations using + with concat() Florian Albrechtskirchinger 2022-04-03 18:34:22 +0200
• 10e451b58d Add string concatenation function Florian Albrechtskirchinger 2022-04-03 17:43:39 +0200
• b9d27b6a1f Support escaping other string types Florian Albrechtskirchinger 2022-04-03 09:04:25 +0200
• a3492aef21 Make exception context optional Florian Albrechtskirchinger 2022-04-03 08:48:49 +0200
• 15fa6a342a
  at.md: fix typo (#3426) Michael Nosthoff 2022-04-06 15:26:35 +0200
• ab36e6cf22
  at.md: fix typo Michael Nosthoff 2022-04-06 15:22:13 +0200
• 448b173ccf
  Update CI image (#3420) Niels Lohmann 2022-04-06 15:14:14 +0200
• 9d608aa772
  🚨 fix duplicate inclusion Niels Lohmann 2022-04-06 13:57:29 +0200
• 2d48787dcc
  📝 update used compilers Niels Lohmann 2022-04-06 13:53:44 +0200
• aca1f3dca6
  💚 add missing compiler Niels Lohmann 2022-04-06 13:23:28 +0200
• 5a97ed6783
  ⬆️ use more recent GitHub actions Niels Lohmann 2022-04-06 13:23:14 +0200
• b4ce4a962b
  🚨 suppress Clang-Tidy warnings Niels Lohmann 2022-04-06 12:58:55 +0200
• acbffd05a4
  💚 use proper scan-build version Niels Lohmann 2022-04-06 12:37:55 +0200
• d1870f9869
  🚨 suppress Clang-Tidy warnings Niels Lohmann 2022-04-06 12:34:56 +0200
• ba6307a6ea
  Merge branch 'develop' of https://github.com/nlohmann/json into new_ci Niels Lohmann 2022-04-06 12:30:01 +0200
• 52e16a9f9c
  🚸 add check if different version is also included #3337 (#3418) Niels Lohmann 2022-04-06 08:29:01 +0200
• fa91409a73
  CI: speedup AppVeyor builds by ~30% (#3422) Florian Albrechtskirchinger 2022-04-06 08:26:49 +0200
• c2054b96b9
  Restore disabled check for #3070 (except on MSVC) (#3421) Florian Albrechtskirchinger 2022-04-06 08:25:35 +0200
• 3fe8396ab0
  ⬆️ use new CI image Niels Lohmann 2022-04-06 07:16:09 +0200
• 4154928a7c CI: speedup AppVeyor builds by ~30% Florian Albrechtskirchinger 2022-04-05 17:17:04 +0200
• db1196f41b Restore disabled check for #3070 (except on MSVC) Florian Albrechtskirchinger 2022-04-05 09:47:39 +0200
• 577d8efdee
  ⬆️ use new CI image Niels Lohmann 2022-04-05 07:22:40 +0200
• 6be9c6f76f
  🚸 add check if different version is also included #3337 Niels Lohmann 2022-04-04 21:22:51 +0200
• ab5cecb34f
  Report the right __cplusplus value for MSVC in basic_json meta() (#3417) flagarde 2022-04-05 02:45:19 +0800
• 5cb7bde72b Run amalgamate flagarde 2022-04-04 22:50:52 +0800
• 8bdfe53a0b Report the right __cplusplus value for MSVC in basic_json meta() flagarde 2022-04-04 22:40:03 +0800
• 33b75e513a
  CI: windows-2016 has been deprecated; remove jobs (#3416) Florian Albrechtskirchinger 2022-04-04 13:18:00 +0200
• 9d11f0a339 CI: windows-2016 has been deprecated; remove jobs Florian Albrechtskirchinger 2022-04-04 06:45:57 +0200
• 6121dbbe02
  Avoid clash with Arduino defines (#3338) DarkZeros 2022-04-03 17:33:33 +0100
• f5f122cd0d
  Apply suggestions from code review Niels Lohmann 2022-04-03 17:18:39 +0200
• 95087716ae
  Apply suggestions from code review Niels Lohmann 2022-04-03 17:17:00 +0200
• 3b16057ffa
  Refactor unit tests to use more convenient doctest assertion macros (Part 2) (#3405) Krzysiek Karbowiak 2022-04-01 14:38:17 +0200
• a7f04487a2 Apply formatting Krzysiek Karbowiak 2022-03-31 08:56:43 +0200
• f421f67da3 Rename local variable Krzysiek Karbowiak 2022-03-30 15:49:43 +0200
• 58a32fea40 Refactor assertion and remove redundant local variable Krzysiek Karbowiak 2022-03-30 15:46:54 +0200
• f12d1ac577 Refactor assertion and remove redundant local variable Krzysiek Karbowiak 2022-03-30 15:45:22 +0200
• 44deb1c508 Refactor assertion and adjust expected error message Krzysiek Karbowiak 2022-03-30 15:42:23 +0200
• 6481d2e7c4 Refactor assertion and adjust expected error message Krzysiek Karbowiak 2022-03-30 15:41:49 +0200
• 66f6b4b6a0
  🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:16:21 +0100
• 1ba736893e
  🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:12:33 +0100
• f7490e33da
  🔧 overwork issue template #3348 Niels Lohmann 2022-03-25 10:10:21 +0100
• ce35256825
  Refactor unit tests to use more convenient doctest assertion macros (#3393) Krzysiek Karbowiak 2022-03-24 15:55:35 +0100
• bd24f687c0
  Merge branch 'nlohmann:develop' into develop Krzysiek Karbowiak 2022-03-24 12:02:48 +0100
• 78580ca8bd
  Merge branch 'develop' of https://github.com/nlohmann/json into update_doctest Niels Lohmann 2022-03-24 07:55:48 +0100
• ad103e5b45
  Improve unit testing (Part 1) (#3380) Florian Albrechtskirchinger 2022-03-24 07:54:07 +0100
• cf2a272e6b
  Merge 93aabac6ef into 700b95f447 domsoll 2022-03-23 19:46:28 -0400
• 4741215786 Apply formatting Krzysiek Karbowiak 2022-03-17 11:55:49 +0100
• 59e51e8a35 Refactor assertions in unit-unicode1.cpp Krzysiek Karbowiak 2022-03-17 10:45:15 +0100
• 8c91092487 Refactor assertions in unit-ubjson.cpp Krzysiek Karbowiak 2022-03-17 10:44:53 +0100
• 443d446bdd Refactor assertions in unit-serialization.cpp Krzysiek Karbowiak 2022-03-17 10:44:31 +0100
• b9ee1de662 Refactor assertions in unit-regression1.cpp Krzysiek Karbowiak 2022-03-17 10:44:11 +0100
• c8b8907dd4 Refactor assertions in unit-reference_access.cpp Krzysiek Karbowiak 2022-03-17 10:43:43 +0100
• 3b1bdf4571 Refactor assertions in unit-msgpack.cpp Krzysiek Karbowiak 2022-03-17 10:43:19 +0100
• 16e9318048 Refactor assertions in unit-modifiers.cpp Krzysiek Karbowiak 2022-03-17 10:42:47 +0100
• 44d242da7d Refactor assertions in unit-json_pointer.cpp Krzysiek Karbowiak 2022-03-17 10:42:03 +0100
• 96783fd22d Refactor assertions in unit-json_patch.cpp Krzysiek Karbowiak 2022-03-17 10:41:34 +0100
• ac8d903b9e Refactor assertions in unit-iterators2.cpp Krzysiek Karbowiak 2022-03-17 10:41:07 +0100
• 1c523fe363 Refactor assertions in unit-iterators1.cpp Krzysiek Karbowiak 2022-03-17 10:40:35 +0100
• b77d8026a8 Refactor assertions in unit-element_access2.cpp Krzysiek Karbowiak 2022-03-17 10:40:08 +0100
• fc10743bdb Refactor assertions in unit-element_access1.cpp Krzysiek Karbowiak 2022-03-17 10:39:32 +0100