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

• 9cdf54b886 Refactor: dump_array doesn't split cases for indent Evan Driscoll 2018-06-02 21:01:22 -0500
• cc4206a718 West const to match existing code Evan Driscoll 2018-06-02 20:51:53 -0500
• dafee1343c Refactor: dump tracks recursive depth, not indent size Evan Driscoll 2018-06-02 20:50:12 -0500
• f180227b6d Fancy serializer: Split object and array handling into functions Evan Driscoll 2018-06-02 20:30:12 -0500
• 0500d41fbb TODO note Evan Driscoll 2018-06-02 20:18:55 -0500
• 7dbfe2459b Refactor: move string handling to dump_string Evan Driscoll 2018-06-02 20:15:07 -0500
• d54f4653ed It's now possible to limit the size of strings Evan Driscoll 2018-06-02 02:09:04 -0500
• 003f3e298b Introduce fancy_serializer_style Evan Driscoll 2018-06-02 01:18:55 -0500
• e38b4e8031 Re-support indentation in fancy_serializer Evan Driscoll 2018-06-02 01:07:25 -0500
• 297ff8e53f Use primitive_serializer in fancy_serializer Evan Driscoll 2018-06-02 00:22:09 -0500
• e9cb8f604d Split primitive serialization into own class Evan Driscoll 2018-06-01 23:58:03 -0500
• a2231324e9 Start reworking fancy serialization tests Evan Driscoll 2018-06-01 23:26:33 -0500
• 607b973035 Fancy Serialization: copy serializer to fancy_serializer Evan Driscoll 2018-06-01 23:01:15 -0500
• b584000e7c Fancy serialiaztion: copy old serialization test file Evan Driscoll 2018-06-01 22:21:27 -0500
• fe90fa5181 Run 'make almalgamate' Evan Driscoll 2018-06-01 23:11:34 -0500
• 4778c02ab5 Set MSVC version from 1514 and older Guillaume Racicot 2018-06-01 14:42:25 -0400
• 714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older Guillaume Racicot 2018-06-01 14:22:57 -0400
• e830bc502f
  Merge pull request #1117 from TinyTinni/develop Niels Lohmann 2018-06-01 08:05:45 +0200
• ecadcdb593 added char cast Matthias Möller 2018-05-31 16:36:16 +0200
• 48656a49f5 typo Matthias Möller 2018-05-31 15:32:21 +0200
• 64acb42aa7 remove stringstream dependency Matthias Möller 2018-05-31 13:27:11 +0200
• 8efbf8d7bb
  📝 documentation to avoid future issues like #1108 Niels Lohmann 2018-05-28 18:14:44 +0200
• e5a67fc3f8
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-05-28 17:57:46 +0200
• a49644ab74
  🚑 adjusted Fuzzer to new parser Niels Lohmann 2018-05-28 17:57:22 +0200
• 0efaf891e5
  Merge pull request #1089 from theodelrieu/feature/map_conversion Niels Lohmann 2018-05-28 14:53:23 +0200
• c5e63fd684
  Provide a from_json overload for std::map Théo DELRIEU 2018-05-14 11:51:37 +0200
• db03d09312
  Merge branch 'feature/key_ref' into develop (fixes #1098) Niels Lohmann 2018-05-27 22:26:00 +0200
• cf9299d222
  Merge branch 'feature/sax2' into develop #971 Niels Lohmann 2018-05-27 18:12:59 +0200
• 3cdc4d784b
  📝 added documentation Niels Lohmann 2018-05-27 18:07:53 +0200
• adf09726b0
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-27 14:26:13 +0200
• 481ace65c4
  🔨 only calculate array index string when needed #1098 Niels Lohmann 2018-05-27 12:04:22 +0200
• 1c6b332dcd
  👌 mitigating cppcheck bug #1101 Niels Lohmann 2018-05-26 14:10:13 +0200
• 90eb0a91e0
  ⚡ keys are now returned as const reference #1098 Niels Lohmann 2018-05-26 13:26:40 +0200
• c0ff2ad581
  Merge d46cf99a85 into 4639bb2c8f abolz 2018-05-18 06:19:31 +0000
• 1f84cc2c88
  ✅ adjusted test cases Niels Lohmann 2018-05-17 16:50:37 +0200
• 717301d1bc
  Merge branch 'testsuite' into feature/sax2 Niels Lohmann 2018-05-17 16:36:43 +0200
• 4639bb2c8f
  ✅ added more tests from recent nst's JSONTestSuite Niels Lohmann 2018-05-17 10:10:01 +0200
• e94862a649
  🚑 fixed error in callback logic Niels Lohmann 2018-05-06 19:00:49 +0200
• ae213721b1
  🔨 removed unget function for wstring parsers Niels Lohmann 2018-05-06 14:05:29 +0200
• 5ff2abb90d
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-06 13:29:23 +0200
• 567fe9b7a0
  Merge pull request #1078 from martin-mfg/patch-1 Niels Lohmann 2018-05-04 17:04:35 +0200
• 377e956655
  fix typo in readme martin-mfg 2018-05-03 22:42:52 +0200
• 5da596385b Update issue templates Niels Lohmann 2018-05-03 18:35:56 +0200
• 7bbe7bb98f
  🔥 removed old issue template Niels Lohmann 2018-05-03 18:35:21 +0200
• 14f01e1981 🔧 update issue templates Niels Lohmann 2018-05-03 18:32:53 +0200
• 3cd01e1614
  Merge 27a61b624a into 86b0732a10 Niels Lohmann 2018-05-03 16:29:26 +0000
• 27a61b624a Update issue templates Niels Lohmann 2018-05-03 18:29:24 +0200
• 86b0732a10
  📝 added public key used for commits and releases Niels Lohmann 2018-05-03 18:11:42 +0200
• ed69e50ad2
  📄 added SPDX-License-Identifier Niels Lohmann 2018-05-03 17:41:45 +0200
• 5bc4ff9da3
  Merge branch 'feature/wstring' into develop Niels Lohmann 2018-04-29 17:29:57 +0200
• fa3e42f826
  Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-29 13:16:12 +0200
• 435fc32a69 Fix operator== overload ambiguity Andreas C. Osowski 2018-04-24 21:58:51 +0200
• da37839bda
  Merge 72ea3f3e5a into b5d1755dfb NateBu 2018-04-26 06:14:00 +0000
• 72ea3f3e5a
  Create blackblox.json NateBu 2018-04-26 00:11:41 -0600
• b5d1755dfb
  🔥 removed commented-out test cases #1060 Niels Lohmann 2018-04-22 15:41:42 +0200
• 0ab8fab338
  Merge pull request #1058 from dns13/patch-1 Niels Lohmann 2018-04-17 23:26:00 +0530
• 65b4d8251b
  Fix typo in single_include, too Jan Schöppach 2018-04-17 13:02:36 +0200
• 53fb230098
  Fix typo Jan Schöppach 2018-04-17 12:08:44 +0200
• 46ec2fddf8
  📝 updated THANKS list Niels Lohmann 2018-04-10 18:13:37 +0200
• b8bfd1140d
  Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements Niels Lohmann 2018-04-10 17:57:21 +0200
• 33a2154f8d Enable target namespaces and build dir project config Chuck Atkins 2018-04-09 11:32:18 -0400
• 29362c6ace
  Merge pull request #1047 from jammehcow/patch-1 Niels Lohmann 2018-04-10 08:39:58 +0200
• c02a3155d4
  👷 added Xcode 9.3 builder Niels Lohmann 2018-04-10 08:39:28 +0200
• 8d8f890771
  💩 first try on #1045 Niels Lohmann 2018-04-10 08:29:07 +0200
• 7f20e9ddc7
  Fixed incorrect version number in README James Upjohn 2018-04-10 17:16:44 +1200
• 031b88d315 Make the CMake install dir user-configurable Chuck Atkins 2018-04-09 11:31:25 -0400
• aaee18ce90 Added test for string conversion with string_view Guillaume Racicot 2018-04-09 11:15:33 -0400
• 7c503c64b7
  Merge pull request #1043 from coryan/patch-1 Niels Lohmann 2018-04-09 08:19:56 +0200
• 4286b16b71
  Fix trivial typo in comment. Carlos O'Ryan 2018-04-08 15:46:25 -0400
• cf91b4f2bb
  Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-08 11:36:58 +0200
• f924df1835
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 11:36:44 +0200
• acf10d9af7
  Merge pull request #1041 from ax3l/topic-spack Niels Lohmann 2018-04-08 11:32:35 +0200
• e1ea8369ad
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 09:31:59 +0200
• 40f279c59d
  Merge branch 'feature/issue1021' into develop Niels Lohmann 2018-04-08 09:28:37 +0200
• 18a0271a95
  Merge branch 'develop' into feature/issue1021 Niels Lohmann 2018-04-08 09:21:43 +0200
• 1ae9896387
  Package Manager: Spack Axel Huebl 2018-04-07 16:43:01 +0200
• 83b143382e
  Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin Niels Lohmann 2018-04-07 15:14:59 +0200
• e439a1a9a7
  CMake: 3.8+ is Sufficient Axel Huebl 2018-04-07 13:15:44 +0200
• 495436a5d5
  Merge pull request #1026 from ktonon/develop Niels Lohmann 2018-04-03 17:34:42 +0200
• a35d414c39 Update CMake to latest on Travis Kevin Tonon 2018-04-03 08:28:07 -0400
• 08a7233d1b
  🚑 fixed commit 1e08654 Niels Lohmann 2018-04-02 22:38:44 +0200
• 1e08654f99
  🔨 cleanup Niels Lohmann 2018-04-02 22:25:17 +0200
• aa89c5e048
  🔨 removing unget_character() function from input adapters #834 Niels Lohmann 2018-04-02 21:10:48 +0200
• 6678eb2b4a
  ✅ improved test coverage #1031 Niels Lohmann 2018-04-02 15:38:49 +0200
• 16c5bfeaad
  👌 fixed compiler warnings #1031 Niels Lohmann 2018-04-02 13:01:56 +0200
• 727dd4664b
  🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 12:27:07 +0200
• ab89ae4e50
  🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 11:34:36 +0200
• eb06d0531a
  🚧 added input adapter for wide strings #1031 Niels Lohmann 2018-04-01 19:12:36 +0200
• ba6edd5634
  🔨 cleanup Niels Lohmann 2018-03-30 00:38:18 +0200
• 6c80612505
  Merge 72e556ef92 into 4efa8cdb4c BrunoFiligree 2018-03-29 22:23:44 +0000
• 850671b9f1
  🔨 using a vector<bool> for the parser hierarchy Niels Lohmann 2018-03-29 18:45:43 +0200
• 4efa8cdb4c
  💚 fixed Valgrind options #1030 Niels Lohmann 2018-03-29 17:19:21 +0200
• 830c93fd09
  📝 fixed example for operator> #1029 Niels Lohmann 2018-03-29 17:07:55 +0200
• c78dbc366c Added test for conversion to string_view Guillaume Racicot 2018-03-29 01:03:57 -0400
• 53d8d57921 Amalgamate single include Guillaume Racicot 2018-03-29 01:03:36 -0400
• 5f723bbec6
  🔨 realized callback parser wirh SAX interface #971 Niels Lohmann 2018-03-28 23:39:39 +0200
• 896a9db461
  🔨 improved code #1021 Niels Lohmann 2018-03-28 19:37:21 +0200
• 73cc5089e3 Using target_compile_features to specify C++ 11 standard Kevin Tonon 2018-03-27 12:51:30 -0400
• a9baab76c2
  🚑 fix for #1021 Niels Lohmann 2018-03-28 18:20:55 +0200
• 72e556ef92 Makde the amalgamated single include file and ran the C++ prettifier on it all. Bruno Nicoletti 2018-03-26 16:32:47 +0100