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

• 76f6740e30 Allow default values for NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE Chaoya Li 2021-06-15 10:14:44 +0800
• 249493264a Improve error message for const fields Alexander Lanin 2021-06-14 23:02:08 +0200
• 18a5f4c7ca
  Merge pull request #2790 from nlohmann/macos_standards Niels Lohmann 2021-06-14 20:23:21 +0200
• aa849a2275 Merge branch 'nlohmann:develop' into without-io David Pfahler 2021-06-14 08:22:49 +0200
• 71a514a651
  Merge pull request #2770 from jasmcaus/patch-1 Niels Lohmann 2021-06-14 07:18:46 +0200
• fde6e1f800
  Merge branch 'develop' of https://github.com/nlohmann/json into macos_standards Niels Lohmann 2021-06-14 07:17:47 +0200
• 95ad4ae071
  Merge pull request #2817 from nlohmann/fix_ci Niels Lohmann 2021-06-14 07:16:32 +0200
• 802895b483
  👷 remove Clang 10 Niels Lohmann 2021-06-13 14:14:10 +0200
• 032f32ebe4
  👷 add Clang 12 Niels Lohmann 2021-06-13 14:04:20 +0200
• 7e92c8af4b Update Package.swift to fix import path Richard Topchii 2021-06-03 16:12:22 +0300
• 25ffa3c7f2 Add README section about Swift Package Manager Richard Topchii 2021-06-03 13:47:40 +0300
• 55116723a1 Add Package.swift Richard Topchii 2021-06-03 13:43:36 +0300
• 569a5dee76 Add empty file to trigger Swift Package Manager to build json module Richard Topchii 2021-06-03 13:43:27 +0300
• e939b59683 fixed amalgation file for #2728 David Pfahler 2021-05-31 14:27:23 +0200
• ae9bbbc941 include io only if JSON_NO_IO is not set for #2728 David Pfahler 2021-05-31 14:26:45 +0200
• 30e52eb046
  👷 execute all tests Niels Lohmann 2021-05-30 13:28:58 +0200
• 2b685c744b
  👷 reduce load Niels Lohmann 2021-05-29 13:10:28 +0200
• 9f5ee3f145
  👷 fix syntax Niels Lohmann 2021-05-28 22:27:46 +0200
• 311730bc3d
  👷 add C++ standards to macOS matrix #2491 Niels Lohmann 2021-05-28 22:23:50 +0200
• e10a3fac8a
  Merge pull request #2789 from TotalCaesar659/patch-2 Niels Lohmann 2021-05-28 10:31:04 +0200
• 9a599ae63a
  Update URLs to HTTPS TotalCaesar659 2021-05-28 00:53:17 +0300
• f118091eaa
  Update CMakeLists.txt Jason Dsouza 2021-05-15 23:39:15 +0530
• 0972f7ff0e
  Merge pull request #2771 from offa/conan_package_url Niels Lohmann 2021-05-15 19:26:34 +0200
• 7935a683f5 link to conan package in readme offa 2021-05-12 16:46:32 +0200
• 6d7959e05d
  Keep consistent formatting Jason Dsouza 2021-05-12 19:25:06 +0530
• 7cafc5c63f
  📝 document Drone CI Niels Lohmann 2021-05-10 14:23:27 +0200
• e856b50791
  🔥 remove arm build Niels Lohmann 2021-05-09 14:22:46 +0200
• a44b29ecf1
  🔧 fix paths Niels Lohmann 2021-05-09 13:52:16 +0200
• 014724f362
  ⚗️ change path Niels Lohmann 2021-05-09 13:49:42 +0200
• 0c62748b75
  🔧 change repository Niels Lohmann 2021-05-09 13:46:48 +0200
• c73bd8b251
  🔧 ignore certificate Niels Lohmann 2021-05-09 13:44:21 +0200
• 3685dbdcfd
  🔧 checkout cmake via git Niels Lohmann 2021-05-09 13:41:40 +0200
• 9746f72d71
  🔨 do not check certificate Niels Lohmann 2021-05-09 13:34:28 +0200
• df6fa6c11c
  👷 arm and arm64 Niels Lohmann 2021-05-09 13:32:50 +0200
• e6e7309514
  👷 arm and arm64 Niels Lohmann 2021-05-09 13:31:27 +0200
• 42f2512290
  🔧 skip slow tests Niels Lohmann 2021-05-09 13:00:35 +0200
• f3193e1e94
  🔧 build ctest Niels Lohmann 2021-05-09 11:07:57 +0200
• 9ec8f4efa8
  🔧 fix ctest path Niels Lohmann 2021-05-09 10:39:37 +0200
• 27a71ccdd8
  🔧 fix path Niels Lohmann 2021-05-08 20:42:24 +0200
• a6e2fd1b15
  🔧 use built CMake Niels Lohmann 2021-05-08 14:41:43 +0200
• 77a5cd247e
  🔧 build cmake Niels Lohmann 2021-05-08 13:56:19 +0200
• 1d8869f8bc
  👷 add Drone CI Niels Lohmann 2021-05-08 13:33:30 +0200
• afbb84b2c8 Add a cmake option to use SYSTEM in target_include_directories Jean-Philippe Lemieux 2021-05-05 16:19:24 -0400
• fc2f7116fe
  Merge pull request #2756 from nlohmann/issue2755 Niels Lohmann 2021-05-04 12:56:46 +0200
• b27938aca3
  👌 apply review comments Niels Lohmann 2021-05-04 12:47:20 +0200
• aaef7cd2f8
  👌 apply review comments Niels Lohmann 2021-05-04 12:35:07 +0200
• b08139ea4b
  ♻️ replace EOF with std::char_traits<char>::eof() Niels Lohmann 2021-05-04 10:22:34 +0200
• eb0f8d734c
  👌 apply review comments Niels Lohmann 2021-05-03 20:42:28 +0200
• 12c0bc4c9e
  📝 document less-than comparability Niels Lohmann 2021-05-03 20:20:52 +0200
• 08185548cc
  🔀 merge develop Niels Lohmann 2021-05-03 20:13:22 +0200
• 4a16e5596c
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-05-03 20:12:53 +0200
• d4f446592f
  Merge pull request #2754 from mortenfyhn/patch-1 Niels Lohmann 2021-05-03 12:24:55 +0200
• 193bf9d6b6
  Fix typo in README Morten Fyhn Amundsen 2021-05-03 09:46:00 +0200
• b11d2ceced
  Fixed cppcheck warning 趙信誠 2021-05-03 13:39:30 +0800
• b2e784c33b
  Merge pull request #2749 from nlohmann/docs Niels Lohmann 2021-04-29 23:05:33 +0200
• d0ab2b86c3
  📝 update documentation Niels Lohmann 2021-04-29 17:19:57 +0200
• 8a29a6ecf4
  Merge pull request #2731 from theShmoo/custom-cpp-version Niels Lohmann 2021-04-29 09:55:16 +0200
• 07344fdd09
  Merge pull request #2747 from nlohmann/docs Niels Lohmann 2021-04-28 22:06:25 +0200
• cdfe865486
  📝 add documentation for numbers Niels Lohmann 2021-04-28 20:33:05 +0200
• d140a1c777 fixed amalgamation file David Pfahler 2021-04-26 08:39:24 +0200
• 5a77314c5e replaced define David Pfahler 2021-04-26 08:07:25 +0200
• a34e011e24
  Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers Niels Lohmann 2021-04-25 15:22:37 +0200
• f1600cd26b
  Merge pull request #2737 from nlohmann/upgrade_ci Niels Lohmann 2021-04-25 15:20:42 +0200
• f6e9654aaa
  🔇 suppress unsigned integer warnings Niels Lohmann 2021-04-25 14:33:12 +0200
• 034861f465
  Create main.yml Isaac Nickaein 2021-04-25 00:04:08 +0430
• 52717b7473
  👷 add clang 11 Niels Lohmann 2021-04-24 14:27:13 +0200
• 608fbffcb1
  📝 update compiler versions Niels Lohmann 2021-04-24 13:51:53 +0200
• 0638a27ed3
  👷 add step for Infer Niels Lohmann 2021-04-24 13:50:30 +0200
• 10fc5162e7
  ⬆️ use Clang 12 where available Niels Lohmann 2021-04-24 13:24:36 +0200
• 42b511f520
  Merge 7f4d035cfe into 9774e53cd6 oficsu 2021-04-23 20:39:20 -0500
• 9774e53cd6
  Merge pull request #2707 from raduteo/patch-2 Niels Lohmann 2021-04-23 09:48:38 +0200
• 0a2de2f5b9 fixed amalgation file for #2728 David Pfahler 2021-04-21 12:54:55 +0200
• 6b267e3cb1 fixed amalgation file for #2730 David Pfahler 2021-04-21 12:53:58 +0200
• 38952643c5 generate amalgation to fix CI for #2730 David Pfahler 2021-04-21 12:46:37 +0200
• 31c4c8f36c Fixes #2730 David Pfahler 2021-04-21 11:03:28 +0200
• 1a1381f071 Fixes #2728 David Pfahler 2021-04-21 10:24:01 +0200
• 35d79203ec
  Update json.hpp raduteo 2021-04-12 19:47:02 -0400
• e8dbd7be86
  Update json.hpp raduteo 2021-04-09 09:35:58 -0400
• b3ec028479
  Merge a9d717b6d4 into 7126d88803 Bellybutn278 2021-04-01 01:53:42 +0000
• ea4891fb5c
  👌 implement some review comments Niels Lohmann 2021-03-31 10:42:08 +0200
• 56bc291b74
  Merge 79f1def05c into 7126d88803 Bellybutn278 2021-03-30 22:18:41 -0500
• 79f1def05c
  Create Octo-recovery Bellybutn278 2021-03-30 22:17:40 -0500
• 02b36e928f
  ⚗️ add forgotten forward Niels Lohmann 2021-03-30 10:46:00 +0200
• 418fdbab62
  ⚗️ exclude iterators from KeyType Niels Lohmann 2021-03-30 10:14:26 +0200
• 69d74d4e3d
  ♻️ clean up Niels Lohmann 2021-03-30 08:41:44 +0200
• f359d74e4d
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-03-30 08:11:16 +0200
• 7126d88803
  Merge pull request #2690 from doronbehar/patch-1 Niels Lohmann 2021-03-30 07:50:28 +0200
• a9d717b6d4
  Create jupyter-playfab Bellybutn278 2021-03-29 21:31:45 -0500
• 53a9850eeb
  pkg-config.pc.in: Don't concatenate paths Doron Behar 2021-03-29 21:43:49 +0000
• 22c0c381fc
  Update README.md Bellybutn278 2021-03-29 16:06:04 -0500
• 7b0e2ee3da
  Merge pull request #1 from Hellochaos/Bellybutn278-patch-xsupport Bellybutn278 2021-03-29 16:03:26 -0500
• df8007ead9
  Update README.md Bellybutn278 2021-03-29 16:01:48 -0500
• 0ff33d090b
  👌 apply review comments Niels Lohmann 2021-03-29 22:32:54 +0200
• 5c1c79b61e
  💚 fix build Niels Lohmann 2021-03-29 15:11:01 +0200
• 203b53d7cb
  💡 update documentation Niels Lohmann 2021-03-29 13:23:09 +0200
• 268600e63b
  👌 apply review comments Niels Lohmann 2021-03-29 12:18:33 +0200
• 47c7e2cfa0
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-03-29 12:07:28 +0200
• 3f33c21725
  Merge pull request #2689 from nlohmann/ci_matrix Niels Lohmann 2021-03-29 09:25:04 +0200
• d927f44576
  💚 fix build Niels Lohmann 2021-03-28 15:30:37 +0200
• 077fe41a82
  🚧 do not check pushes to non-default branches Niels Lohmann 2021-03-28 14:59:42 +0200