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

• 824d55bf26
  📝 fix documentation #1668 Niels Lohmann 2020-08-10 09:24:11 +0200
• e030d26089
  Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler Niels Lohmann 2020-08-08 12:15:10 +0200
• 41a99567e0 fix cmake script overwriting compiler path Jun Jie 2020-08-07 16:08:02 +0800
• fedf82c904
  Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-08-07 09:37:56 +0200
• db78ac1d77
  Merge branch 'release/3.9.1' into develop v3.9.1 Niels Lohmann 2020-08-06 13:49:29 +0200
• 350ff4f7ce
  Merge branch 'release/3.9.1' into master Niels Lohmann 2020-08-06 13:49:17 +0200
• b3e5cb7f20
  🔖 set version to 3.9.1 Niels Lohmann 2020-08-06 13:45:29 +0200
• 86ed1883cb 2020/08/02, empty() instead of size() compare to 0 Suad Halilovic (Sudo) 2020-08-02 17:06:45 +0200
• f4155e4727
  Merge pull request #2333 from nlohmann/fallthrough Niels Lohmann 2020-08-01 15:32:21 +0200
• 8a54617240
  Merge pull request #2332 from nlohmann/issue2330 Niels Lohmann 2020-08-01 12:29:33 +0200
• 0326e4e2a6
  🚨 fix fallthrough warning Niels Lohmann 2020-07-31 19:24:03 +0200
• 3888b1642a
  🐛 fix lexer to properly cope with repeated comments #2330 Niels Lohmann 2020-07-31 18:59:22 +0200
• 1da931730a
  Merge pull request #2327 from nlohmann/issue2326 Niels Lohmann 2020-07-31 08:00:08 +0200
• 1eedee5e4e
  Merge pull request #2319 from nlohmann/issue2315 Niels Lohmann 2020-07-31 07:59:18 +0200
• 501ad6fc59
  📝 fix name of Homebrew formula #2326 Niels Lohmann 2020-07-30 13:31:00 +0200
• 35daa5c00b
  Merge pull request #2320 from wx257osn2/fix-typo Niels Lohmann 2020-07-30 12:27:16 +0200
• 2326abc547
  ♻️ split regression tests Niels Lohmann 2020-07-30 12:13:05 +0200
• f13af83a94
  🐛 add more functions from std::map to nlohmann::ordered_map Niels Lohmann 2020-07-28 21:47:06 +0200
• 2d3fe9d135 fix typo I 2020-07-28 21:54:53 +0900
• e590604822
  🐛 fix a bug due to missing overloads in ordered_map container Niels Lohmann 2020-07-28 14:20:31 +0200
• 1b8efed06f
  Merge pull request #2318 from eli-schwartz/installfix Niels Lohmann 2020-07-28 13:25:04 +0200
• 7d01a9e875
  Merge branch 'develop' into installfix Niels Lohmann 2020-07-28 13:24:54 +0200
• b3da8b325a
  Merge pull request #2314 from xvitaly/fix-path Niels Lohmann 2020-07-28 13:24:08 +0200
• aa06a4761e
  cmake: install pkg-config file relative to current_binary_dir Eli Schwartz 2020-07-27 18:15:18 -0400
• 8f9dc7eabe
  Fixed installation of pkg-config file on other than Ubuntu distributions. Vitaly Zaitsev 2020-07-27 16:54:16 +0200
• d34771cafc
  Merge branch 'release/3.9.0' into develop v3.9.0 Niels Lohmann 2020-07-27 15:54:39 +0200
• 36e5ecf66d
  Merge branch 'release/3.9.0' Niels Lohmann 2020-07-27 15:54:24 +0200
• e110667d21
  🔖 set version to 3.9.0 Niels Lohmann 2020-07-27 15:48:09 +0200
• c006fc9bec
  📝 add more documentation Niels Lohmann 2020-07-27 14:07:13 +0200
• 84c0c76849
  🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-27 09:15:57 +0200
• 2f05f5175c
  🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-26 22:38:14 +0200
• 1b06184f22
  👥 update list of contributors Niels Lohmann 2020-07-26 20:50:04 +0200
• 84a899f511
  👥 update list of contributors Niels Lohmann 2020-07-26 14:54:51 +0200
• 7a4841a42a
  📝 add binary() function to SAX documentation Niels Lohmann 2020-07-26 14:40:46 +0200
• bbcdf18ba5
  🚚 move test utils header file Niels Lohmann 2020-07-26 14:07:34 +0200
• e22cbacc41
  🚨 fix warning Niels Lohmann 2020-07-26 12:12:17 +0200
• 67ed63b196
  Merge pull request #2312 from nlohmann/docs Niels Lohmann 2020-07-26 10:06:01 +0200
• a34070d36a
  ✅ fix test for meta() function Niels Lohmann 2020-07-25 22:28:14 +0200
• 9c75c7eace
  🔧 clean generated XML files Niels Lohmann 2020-07-25 22:04:42 +0200
• 7bd6242f04
  📝 add more documentation Niels Lohmann 2020-07-25 22:00:28 +0200
• 808aca41aa
  Merge pull request #2305 from AODQ/develop Niels Lohmann 2020-07-25 21:51:54 +0200
• 63e7c40e35
  Merge pull request #2297 from nlohmann/issue2286 Niels Lohmann 2020-07-25 21:50:53 +0200
• 1816aae862
  Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 21:48:51 +0200
• 980f8c6f61
  🔀 merge develop branch Niels Lohmann 2020-07-25 21:45:47 +0200
• 42f8708940
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-25 21:44:58 +0200
• 40b78d3847
  Merge pull request #2308 from nlohmann/cbor_tags Niels Lohmann 2020-07-25 19:43:11 +0200
• fad14aabe7
  📝 update output of meta function Niels Lohmann 2020-07-25 14:41:06 +0200
• 6e5be17b62
  📝 add more documentation Niels Lohmann 2020-07-25 14:40:50 +0200
• 62f98b7537
  Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 11:20:13 +0200
• a1dbfcd736
  Merge pull request #2306 from jwittbrodt/develop Niels Lohmann 2020-07-25 10:52:56 +0200
• c00c3162b2
  Merge branch 'develop' into develop Niels Lohmann 2020-07-25 10:52:42 +0200
• 448ceb2e12
  Merge pull request #2303 from nlohmann/cleanup Niels Lohmann 2020-07-25 05:41:51 +0200
• 15ec0fe150 change c-style cast to static_cast for #2304 aodq 2020-07-24 16:21:30 -0400
• 58167173a2
  📝 add more documentation Niels Lohmann 2020-07-24 15:25:53 +0200
• d8d499ce9b
  📝 add more documentation Niels Lohmann 2020-07-24 14:35:52 +0200
• 480ad529e3
  🐛 fix bug in CBOR tag handling Niels Lohmann 2020-07-24 14:18:39 +0200
• a84370c61f
  📝 add more documentation Niels Lohmann 2020-07-24 14:04:58 +0200
• 33662417c1
  ✅ improve coverage Niels Lohmann 2020-07-24 09:32:03 +0200
• 0f22ed0b5b added inline to DEFINE_TYPE macro Jonas Wittbrodt 2020-07-23 19:24:21 +0200
• 12885446d8 fixes unused variable 'ex' for #2304 aodq 2020-07-23 13:21:38 -0400
• 3c7dc635e7
  🙈 extend ignore list Niels Lohmann 2020-07-23 14:19:57 +0200
• 27232455c8
  📝 update documentation Niels Lohmann 2020-07-23 14:17:02 +0200
• 59cb7674be
  📝 update documentation Niels Lohmann 2020-07-23 14:15:20 +0200
• 0cd120f7e1
  🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:06:09 +0200
• bba57cc4af
  🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:02:49 +0200
• e571c67c0d
  🚨 fix implicit conversion warning when opening binary file Niels Lohmann 2020-07-23 14:02:12 +0200
• 43e07bb92d
  Merge pull request #2301 from nlohmann/regression2281 Niels Lohmann 2020-07-23 13:14:24 +0200
• fb22233f34
  🔊 add message if implicit conversions are switched off Niels Lohmann 2020-07-23 13:11:48 +0200
• f9b71afebf
  🚚 unify cmake build dir names Niels Lohmann 2020-07-23 13:02:53 +0200
• 8159091d8f
  🔀 rename variable to avoid shadowing Niels Lohmann 2020-07-23 12:58:09 +0200
• 230dcfb7a3
  🚨 add prefix to avoid shadowing Niels Lohmann 2020-07-23 12:57:52 +0200
• b315fe484a
  🔀 merge develop branch Niels Lohmann 2020-07-23 12:30:26 +0200
• a33c3fdf25
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-23 12:30:07 +0200
• 88122467bd
  ♻️ pull code into function Niels Lohmann 2020-07-23 12:16:18 +0200
• a048b72fe1
  Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator Niels Lohmann 2020-07-23 08:52:51 +0200
• 484029b51c
  Merge pull request #2299 from nlohmann/fix_warnings Niels Lohmann 2020-07-22 18:43:33 +0200
• a6d112ffbf
  ✅ add regression test for #2281 Niels Lohmann 2020-07-22 13:39:40 +0200
• 2301bd1177
  ✅ add regression test for #2281 Niels Lohmann 2020-07-22 13:24:07 +0200
• c4356c68e0
  ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:38:39 +0200
• 4d63252c6c
  ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:23:58 +0200
• a7c4c84d68
  ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:03:37 +0200
• 797329315a
  add a CI job for explicit conversions on every os Théo DELRIEU 2020-07-16 11:22:57 +0200
• 74b446f5fd
  add a switch to enable implicit conversions (defaults to true) Théo DELRIEU 2020-07-16 11:11:35 +0200
• 2cd10a7405
  Merge pull request #2300 from nlohmann/gihub_actions Niels Lohmann 2020-07-22 09:45:55 +0200
• 6bd38a2cb9
  👷 merge Gitlab actions Niels Lohmann 2020-07-22 09:02:55 +0200
• 8b14c9b305
  🚨 fix warnings Niels Lohmann 2020-07-21 23:00:56 +0200
• 3bb43ecd51
  🔀 merge develop branch Niels Lohmann 2020-07-21 22:02:14 +0200
• 3249a4d821
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-21 22:01:32 +0200
• 96e9f66025
  🔇 remove debug output Niels Lohmann 2020-07-21 22:01:15 +0200
• 8046754c15
  🔊 add debug output to tests Niels Lohmann 2020-07-21 12:44:38 +0200
• b1903fff1f
  💚 fix build Niels Lohmann 2020-07-21 09:09:30 +0200
• 1339d6b683
  🐛 add missing EOF check Niels Lohmann 2020-07-20 22:40:28 +0200
• a9117828e1
  🚨 fix warnings Niels Lohmann 2020-07-20 22:38:00 +0200
• 8344857764
  Merge pull request #2287 from pfeatherstone/develop Niels Lohmann 2020-07-20 21:35:55 +0200
• 4a5277d09d
  📝 update documentation Niels Lohmann 2020-07-20 14:11:43 +0200
• 8aa6da61dc
  🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:57:19 +0200
• 7360e09830
  🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:12:20 +0200
• 35b899e988 [JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially pf 2020-07-20 10:51:43 +0100
• 7cf2fe149c
  🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 09:42:37 +0200
• 7660ea12f6 [JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain pf 2020-07-20 08:31:56 +0100