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

• f80827d068
  Merge pull request #873 from nlohmann/feature/issue872 Niels Lohmann 2017-12-14 09:35:48 +0100
• 9a70c60fa5
  Revert "⬆️ updated to Catch 2.0.1" Niels Lohmann 2017-12-14 07:49:16 +0100
• fb8482db76
  👌 fixed some issues from the last commit #875 Niels Lohmann 2017-12-13 23:44:53 +0100
• c6e7eae394
  ✨ implemented JSON Merge Patch (RFC 7396) Niels Lohmann 2017-12-13 23:36:22 +0100
• 920f64c01c
  ⬆️ updated to Catch 2.0.1 Niels Lohmann 2017-12-13 22:18:05 +0100
• 293748a9a9
  📝 overworked README Niels Lohmann 2017-12-13 22:17:02 +0100
• e8d9963abe
  👌 cosmetic changes and overworked spelling Niels Lohmann 2017-12-13 22:15:53 +0100
• a9a4ff61c6
  🚨 remove C4996 warnings #872 Niels Lohmann 2017-12-13 17:01:39 +0100
• f7ae143a93
  Merge pull request #870 from nlohmann/feature/issue838 Niels Lohmann 2017-12-13 06:34:11 +0100
• 8419bfbbd2
  ✅ improved test coverage Niels Lohmann 2017-12-12 20:44:57 +0100
• 569d275f65
  💥 throwing an exception in case dump encounters a non-UTF-8 string #838 Niels Lohmann 2017-12-11 22:38:05 +0100
• 383743c6c0
  Merge pull request #868 from nlohmann/feature/issue867 Niels Lohmann 2017-12-11 08:55:26 +0100
• 7de009edd1
  ✏️ fixing typos #869 Niels Lohmann 2017-12-10 13:07:47 +0100
• 772bb3cc20
  📝 fixing documentation #867 Niels Lohmann 2017-12-10 12:32:20 +0100
• 38e678d9f1 Use Grisu2 for floating-point formatting abolz 2017-12-09 13:14:13 +0100
• 13160d93b2 Add tests for #360 abolz 2017-12-08 15:18:32 +0100
• 468525625a Tests: Re-enable some round-trip tests abolz 2017-12-08 15:18:19 +0100
• 7c3fce7289 Tests: Don't rely on the format used for floating-point formatting abolz 2017-12-08 15:14:54 +0100
• 3232e1f52e Tests: Exponents are formatted with a leading '+' sign abolz 2017-12-08 15:13:53 +0100
• a65d61b9cc Tests: Floating-point formatting uses lower case 'e' abolz 2017-12-08 15:10:58 +0100
• 0693945230
  Merge pull request #860 from bogemic/std_iterator_conformance_cpp17 Niels Lohmann 2017-12-08 07:55:47 +0100
• 64d6daa76e iter_impl template conformance with C++17 Mike Bogdanov 2017-12-07 11:28:28 +0300
• 7c2d4f1852
  👷 added Xcode 9.1 and 9.2 Niels Lohmann 2017-12-06 22:32:03 +0100
• 9e2f185ac6
  💄 reformatted code after PRs Niels Lohmann 2017-12-06 22:21:11 +0100
• c5e731774a
  Merge pull request #856 from bogemic/std_allocator_conformance_cpp17 Niels Lohmann 2017-12-06 21:52:52 +0100
• 25d205c16d
  📝 clarified difference between serialization and string value retrieval #853 Niels Lohmann 2017-12-06 21:42:36 +0100
• fa76f2efd7
  Merge pull request #855 from theodelrieu/fix/cmake_include_directories Niels Lohmann 2017-12-06 20:47:38 +0100
• 8890b935fd fixed merge conflicts Mike Bogdanov 2017-12-06 12:24:50 +0300
• daba1b6a0b fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits Mike Bogdanov 2017-12-05 14:27:08 +0300
• 0e3a0b730b
  Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace Niels Lohmann 2017-12-05 19:36:31 +0100
• 541ee62a05
  cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories Théo DELRIEU 2017-12-05 11:27:03 +0100
• c9a02cbc59
  to/from_json: add a MSVC-specific static_assert to force a stacktrace Théo DELRIEU 2017-12-05 10:52:55 +0100
• f4c01601fa
  Merge pull request #844 from TinyTinni/develop Niels Lohmann 2017-12-04 21:43:22 +0100
• 5e984a2445 To lead people, you must follow behind. Sfinktah Bungholio 2017-12-05 00:01:24 +1100
• 24fe572d98 missing new line Matthias Möller 2017-11-30 13:37:58 +0100
• 8e9a8792a9 moved natis to root dir Matthias Möller 2017-11-30 13:26:45 +0100
• 9aff332bc8 simple .each/.forEach extension Sfinktah Bungholio 2017-11-30 15:30:26 +1100
• af775ddbb8 add compiler & cmake version check Matthias Möller 2017-11-28 23:43:39 +0100
• 980656d7df Merge b9c8842117 into cc937deaf6 Jamie Seward 2017-11-27 11:08:03 +0000
• 48d7a32daa add .natvis for MSVC debug view Matthias Möller 2017-11-26 10:31:33 +0100
• 5b4855dea2 fix targetname Matthias Möller 2017-11-26 10:29:51 +0100
• cc937deaf6
  🚑 the last commit contained a bug #821 Niels Lohmann 2017-11-26 10:15:23 +0100
• 430f03512c
  🚨 fixed some warnings #821 Niels Lohmann 2017-11-25 22:06:18 +0100
• ea5aed0769
  Merge branch 'feature/to_array' into develop Niels Lohmann 2017-11-25 19:41:11 +0100
• de75cf89f7
  ✅ improved test coverage Niels Lohmann 2017-11-25 19:41:02 +0100
• 52ca35b2b0
  Merge pull request #829 from jowr/patch-1 Niels Lohmann 2017-11-18 13:35:21 +0100
• 7b8ddadd83
  removed hunter badge Jorrit Wronski 2017-11-16 21:01:27 +0100
• b5ddd99adf
  Updated hunter package links Jorrit Wronski 2017-11-15 08:48:11 +0100
• 08d5d768d2 Added forward declaration header json_forward.hpp. Minimise build times. zerodefect 2017-11-07 12:38:22 +0000
• 363b01ccea Merge 260c1563bf into 4c4f60f438 AraHaan 2017-11-06 19:37:32 +0000
• 4c4f60f438
  📝 fixes #820 Niels Lohmann 2017-11-06 20:35:05 +0100
• 260c1563bf
  Update json.hpp AraHaan 2017-11-06 12:12:35 -0500
• 30480b177e
  Fix Compile warning in Visual Studio AraHaan 2017-11-06 11:54:49 -0500
• 1f41287078
  Adds get_to Maël Nison 2017-11-05 19:50:01 +0000
• 1af5601a2a
  Merge pull request #811 from Itja/patch-1 Niels Lohmann 2017-10-31 18:23:42 +0100
• e423aea64a
  Typos README Itja 2017-10-31 16:31:14 +0100
• 5696660eba
  🔨 another try to fix #714 Niels Lohmann 2017-10-31 15:04:14 +0100
• c4d6626745
  🚀 installed Request Info Bot Niels Lohmann 2017-10-30 16:04:34 +0100
• 6d2981db82
  📝 overworked templates Niels Lohmann 2017-10-29 16:32:23 +0100
• 87df1d6708
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-10-29 11:55:04 +0100
• fa1425b87c
  🚀 installed Sentiment Bot Niels Lohmann 2017-10-29 11:54:53 +0100
• 73d0095154
  Merge pull request #807 from theodelrieu/fix/805 Niels Lohmann 2017-10-28 15:33:22 +0200
• 4b46abf97c
  add forwarding references to json_ref constructor Théo DELRIEU 2017-10-28 14:22:57 +0200
• 8e067c0c3c
  🔨 set bidirectional iterator tag #593 Niels Lohmann 2017-10-28 09:41:35 +0200
• cea3f24ff9
  📝 comment to address #561 Niels Lohmann 2017-10-27 16:39:52 +0200
• 61cc07ff38
  📝 some documentation Niels Lohmann 2017-10-27 16:07:04 +0200
• 734e2b73cf
  🔨 cleanup Niels Lohmann 2017-10-27 11:49:24 +0200
• 7820b5eccb
  📝 thanks for #795 Niels Lohmann 2017-10-27 11:49:17 +0200
• 77f8e2f987 Merge pull request #795 from jseward/develop Niels Lohmann 2017-10-27 11:47:23 +0200
• b9c8842117 Add necessary LCOV_EXCL_LINE Jamie Seward 2017-10-25 23:49:41 -0700
• c215b77936
  🚀 installed Stale Bot Niels Lohmann 2017-10-25 11:37:33 +0200
• 6fbe924602 Remove std::make_unique Jamie Seward 2017-10-24 23:38:14 -0700
• 4d349abb4d Improve try_throw_exception Jamie Seward 2017-10-24 23:25:11 -0700
• 0207d7e5fa Remove tabs for spaces Jamie Seward 2017-10-24 01:49:48 -0700
• a18eef8d31 Add RTTI disabled logic Jamie Seward 2017-10-24 01:34:27 -0700
• 5fc084d808 Add JSON_EXCEPTIONS_ENABLED Jamie Seward 2017-10-24 01:24:03 -0700
• f6c1ab695c Add JSON_USE_RUNTIME_ERROR_STORAGE Jamie Seward 2017-10-23 23:22:52 -0700
• 720d86d4f1 Fix bugs found in test-class_parser Jamie Seward 2017-10-22 00:38:32 -0700
• c040438e33 Make raising exceptions optional for parse() Jamie Seward 2017-10-22 00:20:15 -0700
• 992c836b30 Add missing spaces Jamie Seward 2017-10-24 00:14:25 -0700
• 715c98b404 Remove extra spaces Jamie Seward 2017-10-24 00:06:22 -0700
• 6c9a401ebc Remove old non-perfect forwarding find and count Jamie Seward 2017-10-24 00:01:56 -0700
• 16ffdbcb20 Remove c++17 support flag in cmake Jamie Seward 2017-10-23 23:50:06 -0700
• 73b1629a15 Remove tabs for spaces Jamie Seward 2017-10-23 23:45:39 -0700
• 1b1bd0e3e6
  ⏪ #714 is still not fixed Niels Lohmann 2017-10-23 12:01:50 +0200
• 33c6511dd0 Remove JSON_HAS_STRING_VIEW Jamie Seward 2017-10-23 00:43:26 -0700
• 89650c99dd
  🚧 checking if #714 is now fixed with MSVC Niels Lohmann 2017-10-22 11:16:33 +0200
• b0c380b0f8
  📝 cleanup after the last PRs Niels Lohmann 2017-10-22 09:12:35 +0200
• be4fba7baf
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-10-22 08:53:46 +0200
• f193427e91
  🔨 some simplifications Niels Lohmann 2017-10-22 08:53:43 +0200
• 24b6e028a9
  ✅ improved test coverage Niels Lohmann 2017-10-22 08:53:27 +0200
• 3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream Niels Lohmann 2017-10-22 08:52:28 +0200
• ef40673acb Merge branch 'develop' into develop-simplify-istream Niels Lohmann 2017-10-22 08:52:15 +0200
• d468f8c4e6 Use consistent logic to determine if string_view exists Jamie Seward 2017-10-21 16:36:05 -0700
• 59cde1ad6e Fix for _HAS_CXX17 == 0 Jamie Seward 2017-10-21 16:29:37 -0700
• 1a66679929 Add string_view support Jamie Seward 2017-10-21 15:20:13 -0700
• 33df3250c3 Merge pull request #793 from sonulohani/develop Niels Lohmann 2017-10-21 10:58:27 +0200
• 92da334862 Error : 'identifier "size_t" is undefined' in linux Sonu Lohani 2017-10-21 12:52:44 +0530
• 2e281ba64b Merge pull request #788 from jseward/develop Niels Lohmann 2017-10-18 15:04:24 +0200
• 6401c9be2e Added a logging message to cmake build NKhanna 2017-10-18 00:59:35 -0700