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

• 61832afe15
  Merge pull request #2144 from XyFreak/gcc10_type_limits Niels Lohmann 2020-05-28 12:59:57 +0200
• 5ff4d7b7ff
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-05-28 12:54:13 +0200
• fcda998ee2
  🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 12:53:22 +0200
• d3caf93ab0
  Merge branch 'develop' into 1813-user-input Francois Chabot 2020-05-28 03:40:34 -0400
• bfcd32c099 removed clang-format Francois Chabot 2020-05-28 03:16:24 -0400
• 3a91a05db6 added custom input to readme Francois Chabot 2020-05-28 03:13:39 -0400
• a4f1cf4d00 better parse documentation Francois Chabot 2020-05-28 02:50:58 -0400
• 76b49f9ee6 misc formatting fixes Francois Chabot 2020-05-28 02:29:53 -0400
• 9ec0e4c25b
  Merge pull request #2140 from nlohmann/issue1715 Niels Lohmann 2020-05-28 07:52:26 +0200
• a01759af0f
  Merge pull request #2143 from quentin-dev/develop Niels Lohmann 2020-05-28 07:50:27 +0200
• 377995f495 forcefully exclude arrays from being interpreted as pointers Francois Chabot 2020-05-27 18:21:38 -0400
• b9416a26aa correct ADL lookup of arrays on Mac and Windows Francois Chabot 2020-05-27 13:21:23 -0400
• f1969e60a3 reamalgamate Francois Chabot 2020-05-27 12:56:26 -0400
• 5684d9a498 unified input API Francois Chabot 2020-05-27 12:40:04 -0400
• e44418ea26
  readme: fix typo in CMake FetchContent example Quentin Barbarat 2020-05-27 13:51:13 +0200
• bb9619ef8b
  📝 request more details in question template Niels Lohmann 2020-05-27 13:22:34 +0200
• 325e8ab8ab
  🔧 explicitly switch on tests in CI Niels Lohmann 2020-05-27 13:22:14 +0200
• 23051df2c7 Cast character to unsigned for comparison Tobias Kux 2020-05-27 13:15:31 +0200
• ed5c28d00c
  👥 update contributor list Niels Lohmann 2020-05-27 13:07:24 +0200
• d70d06ae41
  Merge pull request #2137 from dota17/MSC_VER Niels Lohmann 2020-05-27 08:49:19 +0200
• e3d9b3d755
  📝 add documentation of parser callbacks Niels Lohmann 2020-05-26 14:16:13 +0200
• ace594da6a
  Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-05-26 13:17:55 +0200
• 3c60a66c4c
  Merge pull request #2104 from dota17/issue#2086 Niels Lohmann 2020-05-26 13:15:06 +0200
• 27fe50dc92
  📝 add example for contains #2133 Niels Lohmann 2020-05-26 12:46:04 +0200
• 25aab7ee41
  Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge Niels Lohmann 2020-05-26 12:39:42 +0200
• eb50fbf926 fix issue 2112 chenguoping 2020-05-26 16:43:16 +0800
• 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. Antony Kellermann 2020-05-25 20:46:39 -0400
• 5a72cfa0c3 Add base and base-devel to list of arch linux programs to install. Antony Kellermann 2020-05-25 20:43:15 -0400
• 1d57ddd2d4 Add -y flag to pacman to sync repos. Antony Kellermann 2020-05-25 20:24:54 -0400
• 41a84b1202 Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently. Antony Kellermann 2020-05-25 20:17:02 -0400
• eff2f51071 Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image. Antony Kellermann 2020-05-25 20:14:49 -0400
• bf4a090075 Rename build job to build_stable to be more descriptive. Antony Kellermann 2020-05-25 20:12:54 -0400
• 413df0fd88
  📝 add more content to iterator page Niels Lohmann 2020-05-25 14:03:11 +0200
• 95a3c76643
  📝 make examples collapsible Niels Lohmann 2020-05-24 22:45:38 +0200
• ddf92606ab
  📝 add PlantUML Niels Lohmann 2020-05-24 21:05:35 +0200
• 3400af21cd
  📝 add release page Niels Lohmann 2020-05-24 13:40:43 +0200
• a8f0cd15df
  📝 add mkdocs Niels Lohmann 2020-05-24 13:03:04 +0200
• c92a696852
  📝 update documentation Niels Lohmann 2020-05-22 18:21:37 +0200
• 88292d9499
  🚨 remove redundant assertions Niels Lohmann 2020-05-22 14:19:07 +0200
• 225fa58f16
  🚧 add fix from #1715 Niels Lohmann 2020-05-20 22:20:40 +0200
• b61d563ebe
  Merge branches 'develop' and 'feature/optional' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-05-20 19:00:49 +0200
• a82c80e9af
  Merge pull request #2125 from nlohmann/binary_type Niels Lohmann 2020-05-20 18:58:29 +0200
• ae29456b3f
  🚸 overwork report templates Niels Lohmann 2020-05-20 18:57:21 +0200
• a861bdb81f
  Merge pull request #2121 from gistrec/fix_compilation_error_msvc Niels Lohmann 2020-05-19 13:55:37 +0200
• 4d39644bd0
  💚 fix build Niels Lohmann 2020-05-19 13:45:52 +0200
• 21b1680ea1
  🚚 rename binary_array() to binary() Niels Lohmann 2020-05-19 13:30:22 +0200
• 86b053e916
  Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-19 13:10:35 +0200
• 952a87a4f4
  🚚 move byte container outside detail namespace Niels Lohmann 2020-05-19 13:08:18 +0200
• 79347b484b
  ✅ improve test coverage Niels Lohmann 2020-05-19 12:40:32 +0200
• 5cfa8a586e
  👷 run workflows on pull requests Niels Lohmann 2020-05-18 14:01:54 +0200
• b7ff40029a
  💥 change serialization of binary values Niels Lohmann 2020-05-18 13:53:20 +0200
• 9eb19bcc27
  ✅ add more tests for binary type Niels Lohmann 2020-05-18 12:33:26 +0200
• 9e765f5aed Fixed std::numeric_limit::max() call gistrec 2020-05-18 10:25:38 +0000
• 3f0cf26f7a changes to the single header were applied gistrec 2020-05-18 10:17:45 +0000
• 00cbf8a105 fix issue#1989: only consider continuous numbers chenguoping 2020-05-18 16:43:39 +0800
• 454480f581 fixed a compilation error in MSVC gistrec 2020-05-18 14:57:04 +0700
• 5dec7166ea
  Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-18 09:13:22 +0200
• 16d78a82e0
  👷 add link to GitHub workflows Niels Lohmann 2020-05-18 09:12:18 +0200
• c237aa3a68
  Merge pull request #2119 from nlohmann/release_cleanup Niels Lohmann 2020-05-18 09:07:36 +0200
• 904642f261
  ♻️ rename internal_binary_t with binary_t Niels Lohmann 2020-05-17 22:50:27 +0200
• 1ce8a5be87
  Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-17 14:11:49 +0200
• f25bf312fc
  🏁 include right <optional> header Niels Lohmann 2020-05-17 13:58:09 +0200
• dead99eb0e
  🔨 overwork binary subtypes Niels Lohmann 2020-05-17 13:51:59 +0200
• ab6e76dd05
  Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-17 12:27:58 +0200
• 3799b3f8dd
  Merge pull request #2116 from nlohmann/issue2113 Niels Lohmann 2020-05-17 12:19:06 +0200
• 6154d50a9f
  Merge pull request #2115 from nlohmann/issue2089 Niels Lohmann 2020-05-17 12:17:17 +0200
• 007c6c4bc5
  ✅ update tests Niels Lohmann 2020-05-16 19:37:18 +0200
• 71c80ccfd8
  Merge branches 'develop' and 'feature/optional' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-05-16 19:31:59 +0200
• 28e20bd9e4
  🚨 fix warnings #2113 Niels Lohmann 2020-05-16 14:26:17 +0200
• ad32f576bd
  Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-16 13:22:23 +0200
• c0cf67ead3
  Merge branch 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-16 12:58:13 +0200
• f40a9f876a
  Merge pull request #2044 from dota17/issue#1719 Niels Lohmann 2020-05-16 12:57:00 +0200
• 3ed059f6ff
  ⏪ revert faulty changes Niels Lohmann 2020-05-16 12:56:18 +0200
• bc1886fb60
  ♻️ refine interface of wrapped_binary_t Niels Lohmann 2020-05-15 23:21:49 +0200
• a452e8a0a1
  💚 fix GCC 4.9 compilation Niels Lohmann 2020-05-15 22:38:18 +0200
• ed9c205b5d add somes test cases chenguoping 2020-05-15 21:48:29 +0800
• 5dd27f1a9f compare against max float and min float before converting chenguoping 2020-05-15 21:47:59 +0800
• daf2d296dd
  ♻️ move wrapped binary type to separate file Niels Lohmann 2020-05-15 14:12:32 +0200
• 779a0ec7df update chenguoping 2020-05-15 17:35:43 +0800
• bcf4f3ce9a
  📝 add warning for items() on temporary objects #2040 Niels Lohmann 2020-05-14 19:06:48 +0200
• fc267af909
  📝 update CI list Niels Lohmann 2020-05-14 17:53:00 +0200
• e175150f5b fix UBSAN chenguoping 2020-05-14 20:54:47 +0800
• f4cc729054
  🔊 add compiler version output Niels Lohmann 2020-05-14 13:37:59 +0200
• e91236e6d3
  🔊 add compiler version output Niels Lohmann 2020-05-14 13:33:10 +0200
• 8f5b5c7469 use json_test_data version 2.0.0 chenguoping 2020-05-13 20:31:33 +0800
• 47c6570470 Add some test cases about to_cbor() chenguoping 2020-05-13 20:30:49 +0800
• 44fe284f9d Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float chenguoping 2020-05-13 20:29:10 +0800
• c4c23f34c5
  Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-14 07:55:09 +0200
• 33ae93beed
  📝 update CI list Niels Lohmann 2020-05-14 07:55:01 +0200
• 0857140839
  Merge pull request #1950 from FrancoisChabot/issues/1457 Niels Lohmann 2020-05-14 07:52:02 +0200
• cdf5327ace Fix issue#2086 chenguoping 2020-05-14 12:44:30 +0800
• d7b032f565
  ✅ add tests to improve coverage Niels Lohmann 2020-05-13 21:28:43 +0200
• ec68bb3387
  📝 update CI list Niels Lohmann 2020-05-13 20:18:56 +0200
• f6f350a5c7
  🔊 add operating system output Niels Lohmann 2020-05-13 14:25:51 +0200
• a4266bbb7d
  Merge branch 'develop' into issues/1457 Niels Lohmann 2020-05-13 12:48:46 +0200
• 855d25a76c
  Merge branches 'develop' and 'release_cleanup' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-13 12:41:22 +0200
• a414e35971
  🚨 add newline to end of file Niels Lohmann 2020-05-13 12:35:11 +0200
• def8aeb141
  Merge branches 'develop' and 'release_cleanup' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-13 07:57:03 +0200
• 9265ca7a08
  Merge pull request #2099 from nlohmann/issue2082 Niels Lohmann 2020-05-13 07:56:11 +0200
• 6778ad8b0a
  📝 update year Niels Lohmann 2020-05-12 22:26:55 +0200