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

• f5a487d1b4 fix issue1982: contains() exceptions are incorrectly raised chenguoping 2020-04-13 19:41:13 +0800
• b7be613b6e
  Merge pull request #1990 from dota17/json_pointer Niels Lohmann 2020-04-13 13:29:33 +0200
• 84f19d6333
  Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types Niels Lohmann 2020-04-13 13:19:28 +0200
• b0a3883081
  🎨 fix format Niels Lohmann 2020-04-13 13:11:26 +0200
• 3483d923d4
  Merge pull request #2033 from nlohmann/feature/issue1913 Niels Lohmann 2020-04-13 12:32:37 +0200
• 70be9751cd typo fix Artöm Bakri Al-Sarmini 2020-04-12 23:42:26 +0300
• ec955f08b4 Templatize basic_json ctor from json_ref Artöm Bakri Al-Sarmini 2020-04-12 22:32:39 +0300
• 7fcc860329
  🔥 remove WhiteSource Niels Lohmann 2020-04-12 16:35:41 +0200
• 4396a68d2d
  Merge pull request #1984 from dota17/document-fix Niels Lohmann 2020-04-11 18:55:18 +0200
• 062fd3842c
  Merge pull request #2004 from wsjcpp/develop Niels Lohmann 2020-04-11 11:48:04 +0200
• 9154e991b8
  Merge branch 'develop' into feature/issue1913 Niels Lohmann 2020-04-11 11:33:46 +0200
• d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager Evgenii Sopov 2020-01-18 17:16:25 +0700
• 6121fc52cf
  🎨 fix indentation Niels Lohmann 2020-04-10 13:22:58 +0200
• ea0a7c7b4f
  Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back Niels Lohmann 2020-04-10 13:19:14 +0200
• d01193a4e4
  🎨 run "make amalgamate" Niels Lohmann 2020-04-10 13:18:12 +0200
• 299feb13e7
  Merge pull request #1958 from t-b/add-zc-flag-for-msvc Niels Lohmann 2020-04-10 13:12:34 +0200
• 8db02bcc55 Fix for gcc Artöm Bakri Al-Sarmini 2020-04-08 15:53:14 +0300
• fec0bdd93b still fixing Artöm Bakri Al-Sarmini 2020-04-08 00:42:03 +0300
• 4ce31695f1 Fixed formatting, trying to fix msvc build error in appveyor Artöm Bakri Al-Sarmini 2020-04-08 00:26:43 +0300
• c6b298799a
  👷 remove failing Travis workers Niels Lohmann 2020-04-07 09:09:44 +0200
• 34cf7b7a48 just restart ci chenguoping 2020-04-07 10:00:21 +0800
• 5607dfb48a appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC Thomas Braun 2019-10-23 14:07:19 +0200
• 6a53a95c32 ⬆️ Hedley 13 Niels Lohmann 2020-03-19 11:08:02 +0100
• 3884d33c60
  Merge pull request #1980 from linev/fix_warning Niels Lohmann 2020-04-05 22:00:41 +0200
• 554e8c7356
  Merge pull request #2002 from alexandermyasnikov/develop Niels Lohmann 2020-04-05 21:58:21 +0200
• 5c00308de7
  Merge pull request #2010 from magamig/patch-1 Niels Lohmann 2020-04-05 21:55:47 +0200
• 83e36f314f
  Merge pull request #2008 from garethsb-sony/implicit-cast-vs2019 Niels Lohmann 2020-04-05 21:53:47 +0200
• 379ed1f67e
  💰 add sponsor Niels Lohmann 2020-04-05 15:23:00 +0200
• a74a031bba Fix build error Artöm Bakri Al-Sarmini 2020-04-02 15:47:08 +0300
• e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) Artöm Bakri Al-Sarmini 2020-04-02 15:20:25 +0300
• 3b5726e91f .travis.yml: Switch to latest xcode 10/11 point release Thomas Braun 2020-03-25 21:06:21 +0100
• 3df622a417
  Update LICENSE.MIT Miguel Magalhães 2020-03-25 17:24:23 +0000
• e07686f0c7 update array_index() and add testcases chenguoping 2020-03-25 15:56:45 +0800
• 2e7d340dad docs:modify the document about operator== chenguoping 2020-03-25 10:12:19 +0800
• 7fe16f9400 PR for #2006 to test in AppVeyor. garethsb-sony 2020-03-24 12:53:59 +0000
• dcd3a6c62b move the catch of std::invalid_argument into array_index() chenguoping 2020-03-23 17:24:47 +0800
• 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 chenguoping 2020-03-23 16:08:47 +0800
• 0a8216890d fix C26451 warnnings in to_chars.hpp chenguoping 2020-03-23 15:27:35 +0800
• 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example Alexander Myasnikov 2020-03-21 18:34:40 +0300
• 78e911b8c3
  Use array_idx as methods args Sergey Linev 2020-03-19 11:52:40 +0100
• 19843b038c
  Merge pull request #1933 from dota17/dota17-FAQ Niels Lohmann 2020-03-19 11:25:47 +0100
• ebb5a4c09f
  💰 add sponsor Niels Lohmann 2020-03-19 11:14:50 +0100
• 425039280c
  กูเอง Apichat Khankaew 2020-03-19 02:26:57 +1100
• 495827cd22
  กูเอง Apichat Khankaew 2020-03-19 02:25:35 +1100
• b03db9dd0c
  กูเอง Apichat Khankaew 2020-03-19 02:21:58 +1100
• cf45642efe
  กูเอง Apichat Khankaew 2020-03-19 02:19:32 +1100
• cc6afe6be1
  บ่าตำเฮาตำโบม Apichat Khankaew 2020-03-19 02:14:25 +1100
• bfc003cadf catch exceptions for json_point : /xx/+99 chenguoping 2020-03-17 20:49:28 +0800
• 2ccdfebaa7 fix typo chenguoping 2020-03-14 18:10:55 +0800
• 54656ef279
  Merge pull request #1956 from dota17/dota17-fix-typo Niels Lohmann 2020-03-13 17:26:24 +0100
• d102da61ad
  Merge pull request #1979 from alex-weej/patch-2 Niels Lohmann 2020-03-13 16:49:13 +0100
• 00049c20d0 Rename argument array_index to array_indx in json_pointer methods Sergey Linev 2020-03-11 07:41:53 +0100
• 5fdb1d08aa
  README: Fix string representation of dumped json Alexander “weej” Jones 2020-03-10 19:37:20 +0000
• 41b0704ce1 removed move assignments from input adapters Francois Chabot 2020-03-02 23:50:01 -0500
• 7eadd6daef added back forward declaration to address warnings Francois Chabot 2020-02-28 18:15:11 -0500
• 699e0a923c fix typo in examples dota17 2020-02-26 13:44:08 +0800
• c7282d5b1e simpler endian detection for older gcc versions Francois Chabot 2020-02-20 10:19:29 -0500
• 770ae6e9da accomodate older gcc Francois Chabot 2020-02-19 16:54:09 -0500
• de35fad88e fixed missing return arg of operator=() Francois Chabot 2020-02-19 15:23:49 -0500
• 2e2cf02cfd duck-typed object input adapters Francois Chabot 2020-02-19 14:59:31 -0500
• a0c4fc945a fixed bad friend class declaration Francois Chabot 2020-02-19 11:23:02 -0500
• 617b3cf42e templated input adapters Francois Chabot 2020-02-19 10:32:49 -0500
• 42566c6bef
  Update README.md Chen 2020-02-17 15:40:52 +0800
• 61b46a56fb
  🏗️ replace is_pod by is_trivial Niels Lohmann 2020-02-15 10:12:27 +0100
• 3c3c11a6cb Specify signed char Tony Asleson 2020-02-12 13:27:06 -0600
• 88097a250f
  Update README.md : add a FAQ about memory release Chen 2020-02-10 21:03:57 +0800
• 973c52dd4a
  Merge pull request #1923 from Coeur/typos Niels Lohmann 2020-02-02 14:48:07 +0100
• 8d92ca865f Some typos Antoine Cœur 2020-02-02 17:29:37 +0800
• 6a6790ab68
  Merge pull request #1917 from jothepro/update-links-to-hunter Niels Lohmann 2020-01-31 11:47:42 +0100
• 3eb6b0e7a2
  Merge pull request #1918 from kastiglione/patch-1 Niels Lohmann 2020-01-31 11:46:53 +0100
• f25a1287f9
  Fix link to parse function in README Dave Lee 2020-01-29 14:19:00 -0800
• 0257533866
  Updated links to hunter repo & docs jothepro 2020-01-29 22:33:59 +0100
• 6ca5338a0c
  Merge pull request #1909 from Klaim/patch-1 Niels Lohmann 2020-01-28 19:00:45 +0100
• 393345cade Fixed issue with target_compile_options James Moore 2020-01-26 11:02:17 +0000
• 77a074c5be Use modern cmake approach for flags. Fixed VS2015 warning James Moore 2020-01-24 07:41:37 +0000
• ab538ba523
  Formatting Joël Lamotte 2020-01-21 17:49:23 +0100
• 708e107d8e
  Adds instruction for using Build2's package manager Joël Lamotte 2020-01-20 14:50:15 +0100
• ad383f66bc
  Merge pull request #1907 from pauljurczak/patch-1 Niels Lohmann 2020-01-19 22:45:53 +0100
• bc95563814
  Update README.md Paul Jurczak 2020-01-18 14:25:03 -0700
• 7acf6218b6
  📝 fix typo #1903 Niels Lohmann 2020-01-15 17:40:03 +0100
• 1a23a9fd4a Fixed clang pragma and replaced with DOCTEST version James Moore 2020-01-12 12:37:42 +0000
• 0feea6168d
  📝 fix scanner documentation Niels Lohmann 2020-01-12 10:22:11 +0100
• ed104d547f Fixed clang build James Moore 2020-01-11 12:40:03 +0000
• 658e613902 Fix unused_func warning. Function was declared but not defined James Moore 2020-01-11 12:26:29 +0000
• e9da9ca93f Added flags to cmakelists in test project to treat all warnings as errors James Moore 2020-01-11 12:06:56 +0000
• 9b0a3e6712 Rename unit-unicode tests based on current convention Isaac Nickaein 2019-12-29 16:15:17 +0330
• 3e9d74df56 Split test-unicode to avoid timeouts Isaac Nickaein 2019-12-29 16:07:27 +0330
• e8678d3a83 Ignores the cppcheck warnings about missing explicit keywords on constructor with one parameter in input_adapters.hpp. Xav83 2019-12-20 21:35:07 +0100
• 67b8c21a78 Ignores the cppcheck warnings about missing explicit keywords on constructor with one parameter in json_ref.hpp. Xav83 2019-12-20 21:29:08 +0100
• edef01a64f Ignores the cppcheck warnings about missing explicit keywords on constructor with one parameter in output_adapters.hpp. Xav83 2019-12-20 21:26:46 +0100
• 54b96aa92b Ignores the cppcheck warnings about missing explicit keywords on constructor with one parameter in json.hpp. Xav83 2019-12-20 18:37:31 +0100
• 6b31375c7c
  ⚗️ set CXXFLAGS Niels Lohmann 2019-12-19 12:25:27 +0100
• a2fea87ef6
  Merge pull request #1872 from remedi/feature/optional Niels Lohmann 2019-12-18 10:59:57 +0100
• 1b846c9d81 Use JSON_HAS_CPP_17 only after it has been defined Markus Palonen 2019-12-17 16:25:35 +0200
• bde5712418
  Merge pull request #1871 from sonulohani/develop Niels Lohmann 2019-12-16 15:06:47 +0100
• 4c1ebb4413
  Fix warning: ignoring return value Sonu Lohani 2019-12-16 14:22:41 +0530
• b568619c4a
  💰 add sponsor section Niels Lohmann 2019-12-15 19:26:51 +0100
• bccc8f0577
  Merge pull request #1857 from gocarlos/develop Niels Lohmann 2019-12-01 11:53:24 +0100
• ac9df48453
  style: format readme Carlos Gomes Martinho 2019-12-01 10:23:24 +0100
• f44e8ac090
  revert: adding conan badge Carlos Gomes Martinho 2019-12-01 10:22:48 +0100