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

• 61f0bfb15c
  🔨 enforce using Python 2 for the wandbox script Niels Lohmann 2018-02-11 14:46:15 +0100
• 548f488941
  🔨 overworked Makefile Niels Lohmann 2018-02-10 14:46:39 +0100
• 865ff00de0
  📝 updated documentation wrt. objects #963 Niels Lohmann 2018-02-09 23:37:20 +0100
• addbbbe136
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-02-09 23:32:37 +0100
• 0a64982e86
  📝 cleanup after #954 Niels Lohmann 2018-02-09 23:32:28 +0100
• e5d538c5ea
  Merge pull request #954 from pfultz2/patch-1 Niels Lohmann 2018-02-09 23:28:54 +0100
• 2dda87c3b7
  Merge branch 'feature/coverage_multi' into develop Niels Lohmann 2018-02-09 23:01:56 +0100
• 5731695d7b
  Clarify dev version and add space after the word flag. Paul Fultz II 2018-02-09 15:45:20 -0600
• 74675dd69c
  ⏪ back to the original version Niels Lohmann 2018-02-09 22:40:52 +0100
• 50863c5a09
  Latest updates based on feedback Paul Fultz II 2018-02-09 15:35:46 -0600
• ab05df3a48
  🔨 another try Niels Lohmann 2018-02-09 22:27:08 +0100
• b455154cc9
  🔨 another try Niels Lohmann 2018-02-09 22:18:51 +0100
• 1e8f4d6ab3
  🔨 more trying Niels Lohmann 2018-02-09 22:11:05 +0100
• 316634e129
  🔨 added quotes around parameters Niels Lohmann 2018-02-09 21:54:32 +0100
• 0111f3187e
  🔨 working on #953 Niels Lohmann 2018-02-09 21:30:15 +0100
• 83db7876c5
  🏁 removing test case that fails on MSVC #962 Niels Lohmann 2018-02-09 18:32:12 +0100
• 33a9b00ce6
  🐛 fix for #962 Niels Lohmann 2018-02-06 22:38:53 +0100
• 8b457ace25
  🐛 fixing CBOR's indefinity length strings #961 Niels Lohmann 2018-02-06 20:43:03 +0100
• 556e30f759
  Merge pull request #955 from patrikhuber/patch-1 Niels Lohmann 2018-02-06 20:18:14 +0100
• ee76436592
  Change to angle brackets Patrik Huber 2018-02-06 11:29:37 +0000
• 737cffe0cb
  🔨 fixed directory for lcov coverage Niels Lohmann 2018-02-04 20:58:50 +0100
• ae688016f6
  Changed links from master to develop branch Patrik Huber 2018-02-04 12:41:46 +0000
• 2b7b39c72d
  🚀 added release target #956 Niels Lohmann 2018-02-04 13:29:23 +0100
• 44b40d7c6a
  Fix links in README.md Patrik Huber 2018-02-03 15:48:02 +0000
• 3402260983
  Add a note about installing the library with cget Paul Fultz II 2018-02-02 11:13:13 -0600
• 3a887dc9fe
  👷 fixed coveralls Niels Lohmann 2018-02-02 07:56:30 +0100
• 5c2a0a511e
  👷 fixed coveralls Niels Lohmann 2018-02-02 07:31:57 +0100
• b779666916
  👷 re-added homebrew tests Niels Lohmann 2018-02-02 00:20:04 +0100
• 97309f0da9
  Merge branch 'release/3.1.0' into develop v3.1.0 Niels Lohmann 2018-02-02 00:06:17 +0100
• 15acf260ca
  Merge branch 'release/3.1.0' 3.1.0 Niels Lohmann 2018-02-02 00:05:55 +0100
• a8fcfd9880
  👷 fixed travis file Niels Lohmann 2018-02-01 22:34:14 +0100
• f5c03999d0
  🔨 fixed benchmark compilation Niels Lohmann 2018-02-01 22:26:26 +0100
• 0258484626
  🔖 set version to 3.1.0 Niels Lohmann 2018-02-01 22:20:26 +0100
• ce7d0ebf5d
  Merge pull request #944 from theodelrieu/fix/cmake_install Niels Lohmann 2018-02-01 18:39:07 +0100
• 14cd019861
  fix cmake install directory (for real this time) Théo DELRIEU 2018-01-29 11:21:11 +0100
• 9958dde3da
  Merge pull request #950 from kaidokert/develop Niels Lohmann 2018-02-01 09:29:53 +0100
• aed4a080bf Templatize std::string in binary_reader #941 Kaido 2018-01-31 23:01:01 -0800
• 94d39856e3
  Merge 57db153ea7 into e8bf1f62f7 George Kasparyants 2018-02-01 02:11:11 +0000
• e8bf1f62f7
  ✨ added define for library version #948 #943 Niels Lohmann 2018-01-31 22:36:18 +0100
• 552d153842
  📝 added more statistics on binary formats Niels Lohmann 2018-01-31 21:54:38 +0100
• 60e2d28eb7
  🐛 fix for #947 Niels Lohmann 2018-01-31 20:53:13 +0100
• 51c774f208
  📝 added documentation for binary formats Niels Lohmann 2018-01-31 17:23:11 +0100
• 57e6fddd90
  🚨 fixed warnings Niels Lohmann 2018-01-30 23:57:49 +0100
• f7131715b1
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-30 23:20:39 +0100
• ce273af9b6
  📝 added documentation for binary formats Niels Lohmann 2018-01-30 23:20:36 +0100
• ae235139b9
  Merge pull request #940 from kaidokert/develop Niels Lohmann 2018-01-29 22:04:26 +0100
• 8049442c2a
  🔨 rename yytext to token_buffer (fixes #933) Niels Lohmann 2018-01-29 21:56:13 +0100
• d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938 Kaido 2018-01-28 14:42:13 -0800
• b3bd3b726b
  📝 added link to OSS-Fuzz project repository Niels Lohmann 2018-01-28 21:02:02 +0100
• 52e9449563
  📝 added more functions to overview Niels Lohmann 2018-01-28 20:44:45 +0100
• cb4a9c85cb
  🔨 excluded code from coverage Niels Lohmann 2018-01-28 17:55:40 +0100
• 1483d39c91
  🔨 moved class json_pointer into separate file #920 Niels Lohmann 2018-01-28 15:36:56 +0100
• e95578f884
  📝 documented JSON Merge Patch (RFC 7386) Niels Lohmann 2018-01-28 14:36:17 +0100
• 102c474397
  🔨 clean up Niels Lohmann 2018-01-28 14:13:02 +0100
• 6855bbb902
  🔨 split "parsing" directory to "input" and "output" Niels Lohmann 2018-01-28 13:15:03 +0100
• 05f49fa401
  ✅ added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:47:32 +0100
• f0b26c8f38
  ✅ added fuzzer for UBJSON input Niels Lohmann 2018-01-27 18:38:11 +0100
• b0a68f540f
  ✅ added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:37:55 +0100
• 1be3935e9d
  📝 cleanup after #936 Niels Lohmann 2018-01-27 17:43:44 +0100
• 7aace7c976
  Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning Niels Lohmann 2018-01-27 16:51:52 +0100
• 0e2211df0e
  Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd Niels Lohmann 2018-01-25 17:11:21 +0100
• 95cf1fefaa Removed compiler warning about unused variable 'kMinExp'. zerodefect 2018-01-25 12:51:48 +0000
• 355c1e946b
  👷 added task to check amalgamation #906 Niels Lohmann 2018-01-23 18:00:12 +0100
• dbfd7e532b
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-23 16:33:10 +0100
• 3c68a796df
  🔥 deprecated iterator_wrapper #874 Niels Lohmann 2018-01-23 16:33:08 +0100
• f05c3edc21
  Merge pull request #930 from Pipeliner/develop Niels Lohmann 2018-01-23 07:32:23 +0100
• f5c4e9f3a1
  Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types Niels Lohmann 2018-01-23 07:32:06 +0100
• 7eabb6ba36
  📝 updated documentation for UBJSON functions Niels Lohmann 2018-01-22 23:23:17 +0100
• fc32b8a9bc
  Fix a typo in README.md Vadim Evard 2018-01-22 13:14:39 +0300
• 3cca630836
  🔨 cleanup after #915 Niels Lohmann 2018-01-21 15:55:35 +0100
• 010e596001
  Merge pull request #915 from abolz/dtoa Niels Lohmann 2018-01-21 15:02:57 +0100
• 3d776b0582
  📝 updated README Niels Lohmann 2018-01-21 14:13:42 +0100
• 9e5d901f55
  Merge branch 'feature/ubjson' into develop Niels Lohmann 2018-01-21 14:04:29 +0100
• 327b8bb09e
  Merge branch 'feature/strings' into develop Niels Lohmann 2018-01-21 13:55:52 +0100
• d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step. zerodefect 2018-01-19 11:42:53 +0000
• b406e3704b
  ➕ using Google Benchmark #921 Niels Lohmann 2018-01-18 22:00:32 +0100
• a8f711a2f1
  ➕ using Google Benchmark #921 Niels Lohmann 2018-01-18 21:57:21 +0100
• 18b22e9a6d Merge 8d6d3b77c8 into 6402077ac2 bogemic 2018-01-18 09:44:13 +0000
• 8d6d3b77c8 pvs studio. fixed warning about duplicate condition Mike Bogdanov 2018-01-18 12:42:37 +0300
• 6402077ac2
  Merge pull request #876 from nlohmann/feature/rfc7396 Niels Lohmann 2018-01-18 06:49:31 +0100
• dcee778c1e
  fix sfinae on basic_json UDT constructor Théo DELRIEU 2018-01-17 12:17:38 +0100
• 7456f1d87b
  ♻️ re-used existing UTF-8 decoder to simplfy string serialization Niels Lohmann 2018-01-16 20:42:00 +0100
• afe4571309
  🔨 cleanup + some noexcept Niels Lohmann 2018-01-16 20:41:04 +0100
• b182308eff
  🔨 cleanup Niels Lohmann 2018-01-16 20:40:24 +0100
• 57db153ea7 add std::to_string method for json object delta37 2018-01-16 18:33:42 +0300
• 9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip abolz 2018-01-15 21:26:03 +0100
• 810f81bbd9 Regenerate src/json.hpp abolz 2018-01-15 21:24:59 +0100
• 787204f076 Add unit-tests for detail::to_chars abolz 2018-01-15 21:13:17 +0100
• 9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's abolz 2018-01-15 20:58:02 +0100
• 332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion abolz 2018-01-15 20:45:51 +0100
• 0695ac4001 Add tests for #360 abolz 2018-01-15 20:41:20 +0100
• 68a9736738 Tests: Re-enable some round-trip tests abolz 2018-01-15 20:40:57 +0100
• 6e2e466c27 Tests: Don't rely on the format used for floating-point formatting abolz 2018-01-15 20:39:16 +0100
• 107c21a488 Tests: Exponents are formatted with a leading '+' sign abolz 2018-01-15 20:39:00 +0100
• 3ae82d91a2 Tests: Floating-point formatting uses lower case 'e' abolz 2018-01-15 20:38:47 +0100
• 92f7295063
  🔨 cleanup Niels Lohmann 2018-01-15 13:21:33 +0100
• 06c7989f60 Merge 38e678d9f1 into d9446b0e6e abolz 2018-01-15 11:19:11 +0000
• 3ac674562f
  🔨 clean up Niels Lohmann 2018-01-14 22:26:20 +0100
• d9446b0e6e
  Merge pull request #911 from theodelrieu/fix/cmake_install Niels Lohmann 2018-01-14 20:08:49 +0100
• 9d6b3731b9
  ✅ improved test coverage Niels Lohmann 2018-01-14 20:07:38 +0100