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

• 856ef47367
  Update include/nlohmann/json.hpp Niels Lohmann 2018-10-26 16:34:03 -0400
• e49e1dc294
  Update include/nlohmann/json.hpp Niels Lohmann 2018-10-26 16:33:53 -0400
• ad639ad5e6
  ✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 Niels Lohmann 2018-10-26 14:48:20 +0200
• 544150d5a5
  🚨 fixed another linter warning Niels Lohmann 2018-10-26 11:10:49 +0200
• c2e175763c
  👌 added another conversion function #1315 Niels Lohmann 2018-10-25 22:47:08 +0200
• d97fa30795
  👌 fixed comment #1320 Niels Lohmann 2018-10-25 22:29:27 +0200
• 7ce720b700
  🚨 fixed coverage Niels Lohmann 2018-10-25 18:21:50 +0200
• 01a50e4476 runs make amalgamate Timothy Prepscius 2018-10-25 09:08:27 -0400
• e25d8c33f5 Merge remote-tracking branch 'origin/develop' into enable_string_view Timothy Prepscius 2018-10-25 09:03:32 -0400
• 7d61c429f6 enables string_view Timothy Prepscius 2018-10-25 09:03:22 -0400
• d41321159b runs make amalgamate Timothy Prepscius 2018-10-25 08:51:29 -0400
• 19647e083c
  🚨 fixed compiler warnings Niels Lohmann 2018-10-25 14:27:55 +0200
• 62126278a6
  🔨 added fix for arrays Niels Lohmann 2018-10-25 13:01:18 +0200
• 24a4142399 BSON: Fixed array serialization by adding increasing integral names to the array elements Julian Becker 2018-10-25 07:38:02 +0200
• 1968e5c793
  🎨 clean up binary formats Niels Lohmann 2018-10-24 23:39:30 +0200
• 4d1eaace8c
  🔨 fixed fuzz code to avoid false positives in case of discarded values Niels Lohmann 2018-10-24 18:55:08 +0200
• e2c5913a50
  🚧 some changes to the BSON code Niels Lohmann 2018-10-24 15:43:37 +0200
• bba159121f
  Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson Niels Lohmann 2018-10-24 15:03:15 +0200
• f102df3cba
  📝 updated documentation #1314 Niels Lohmann 2018-10-24 09:28:57 +0200
• 7b501de054
  Merge pull request #1314 from nlohmann/feature/codec_errors Niels Lohmann 2018-10-24 08:40:58 +0200
• b76eaabd9b revised adding string_view and stuct { const char * } Timothy Prepscius 2018-10-23 21:09:16 -0400
• e66a3e5242 moves the comment to a more appropriate position, nullifies the root if referenced in erase Timothy Prepscius 2018-10-23 17:51:58 -0400
• 20038e2703
  📝 added a note to the discussion #1286 Niels Lohmann 2018-10-23 23:00:43 +0200
• 87ef3f25f2
  ✏️ fixed a typo #1314 Niels Lohmann 2018-10-23 22:56:10 +0200
• 44166ff4d6 enables erase by json_pointer Timothy Prepscius 2018-10-23 16:41:49 -0400
• b49f76931f
  👌 replaced static_cast to CharType by conversion function #1286 Niels Lohmann 2018-10-23 17:49:04 +0200
• 2343d9caeb
  💚 additional tests from the Unicode spec #1198 Niels Lohmann 2018-10-23 17:22:13 +0200
• b702163c9a Adding to file imp_iterator Vicente Mataix Ferrándiz 2018-10-23 13:10:59 +0200
• 5ac2d65047 Adding to single include Vicente Mataix Ferrándiz 2018-10-23 13:06:01 +0200
• 951a7a6455
  🚧 fixed test cases #1198 Niels Lohmann 2018-10-22 18:20:45 +0200
• c51b1e6fab
  🚧 fixed an issue with ensure_ascii #1198 Niels Lohmann 2018-10-22 15:53:36 +0200
• c7af027cbb
  🚧 respect ensure_ascii parameter #1198 Niels Lohmann 2018-10-22 09:18:16 +0200
• e5dce64115
  💚 added tests #1198 Niels Lohmann 2018-10-21 23:26:25 +0200
• c5821d91e5
  🚧 overworked error handlers #1198 Niels Lohmann 2018-10-21 11:49:37 +0200
• ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message Julian Becker 2018-10-18 20:05:46 +0200
• 9294e25c98
  Merge pull request #1301 from theodelrieu/fix/1299 Niels Lohmann 2018-10-18 19:18:48 +0200
• 65c6127503
  Merge 6393acc1b0 into b553a8a93c drodil 2018-10-18 15:47:18 +0000
• 6393acc1b0 Add clang-format call to pretty Makefile target Heikki Hellgren 2018-10-18 18:26:05 +0300
• f2b3572799 Add .clang-format file for json Heikki Hellgren 2018-10-18 15:28:40 +0300
• b553a8a93c
  Merge pull request #1305 from koponomarenko/add-meson-info Niels Lohmann 2018-10-18 10:55:25 +0200
• 5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp Julian Becker 2018-10-18 06:38:34 +0200
• 8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() Julian Becker 2018-10-17 21:47:01 +0200
• f0c55ce0e0 Add Meson related info to README Kostiantyn Ponomarenko 2018-10-17 21:37:08 +0300
• 2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson Julian Becker 2018-10-17 19:06:22 +0200
• 4b2a00641c
  Merge pull request #1303 from nlohmann/feature/binary_errors Niels Lohmann 2018-10-17 17:54:14 +0200
• dbb0b63187
  ♿ improved error messages for binary formats #1288 Niels Lohmann 2018-10-17 12:15:58 +0200
• a946dfc19c
  add a note to maintainers in type_traits.hpp Théo DELRIEU 2018-10-17 12:03:10 +0200
• ec1461f65c
  Merge cc5b565a58 into dd672939a0 drodil 2018-10-16 19:17:46 +0000
• cc5b565a58 Add integration to conan.io package manager Heikki Hellgren 2018-10-16 22:14:17 +0300
• 978c3c4116 BSON: throw json.exception.out_of_range.409 in case a key to be serialized to BSON contains a U+0000 Julian Becker 2018-10-16 20:42:00 +0200
• 0671e92ced
  🚧 proposal for different error handlers #1198 Niels Lohmann 2018-10-16 20:38:50 +0200
• daa3ca8a2e BSON: Adjusted documentation of binary_writer::to_bson() Julian Becker 2018-10-16 19:29:42 +0200
• 5bccacda30 BSON: throw json.exception.out_of_range.407 in case a value of type std::uint64_t is serialized to BSON. Also, added a missing EOF-check to binary_reader. Julian Becker 2018-10-16 19:13:07 +0200
• 45c8af2c46
  add new is_constructible_* traits used in from_json Théo DELRIEU 2018-10-16 14:00:34 +0200
• dd672939a0
  Merge pull request #1294 from theodelrieu/fix/json_ref_ctor Niels Lohmann 2018-10-12 17:35:41 +0200
• 11fecc25af
  add constraints for variadic json_ref constructors Théo DELRIEU 2018-10-12 10:54:58 +0200
• e426219256
  Merge pull request #1282 from nlohmann/feature/lines_columns Niels Lohmann 2018-10-08 22:17:33 +0200
• adfa961ed0
  Merge pull request #1280 from nlohmann/feature/linter Niels Lohmann 2018-10-08 21:05:33 +0200
• 6d34d64bfd
  🚑 fixed compilation error Niels Lohmann 2018-10-08 06:54:51 +0200
• 74a31075e3
  ♿ improved parse error messages Niels Lohmann 2018-10-07 22:39:17 +0200
• 6e49d9f5ff
  🚑 fixed compilation error Niels Lohmann 2018-10-07 21:34:40 +0200
• f8158997b5
  📝 fixed documentation Niels Lohmann 2018-10-07 21:30:58 +0200
• df0f612d1b BSON: allow and discard values and object entries of type value_t::discarded Julian Becker 2018-10-07 20:08:05 +0200
• 3abb788139
  🚨 fixed some more clang-tidy warnings Niels Lohmann 2018-10-07 19:07:58 +0200
• 858e75c4df
  🚨 fixed some clang-tidy warnings Niels Lohmann 2018-10-07 18:39:18 +0200
• 062aeaf7b6 BSON: Reworked the binary_writer such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators. Julian Becker 2018-10-07 17:57:13 +0200
• 6d09cdec34
  🐛 fixed a bug in the unget function Niels Lohmann 2018-10-07 16:48:45 +0200
• 011b15dd08
  ♿ added line positions to error messages Niels Lohmann 2018-10-07 12:27:24 +0200
• 81f4b34e06 BSON: Improved documentation and error handling/reporting Julian Becker 2018-10-07 07:52:12 +0200
• 8943c965cb
  Merge 21febe645a into ac38e95780 efp 2018-10-06 14:48:05 +0000
• ac38e95780
  Merge pull request #1277 from performous/fix-clang-detection Niels Lohmann 2018-10-06 16:29:26 +0200
• fa722d5ac3
  🚨 fixed another linter warning Niels Lohmann 2018-10-06 16:26:47 +0200
• ec95438a59
  🚨 fixed some linter warnings Niels Lohmann 2018-10-06 13:49:02 +0200
• f1768a540a
  Merge branch 'release/3.3.0' into develop v3.3.0 Niels Lohmann 2018-10-05 12:59:41 +0200
• aafad2be1f
  Merge branch 'release/3.3.0' 3.3.0 Niels Lohmann 2018-10-05 12:59:28 +0200
• cdfe6ceda6
  🔖 set version to 3.3.0 Niels Lohmann 2018-10-05 11:20:10 +0200
• b968faa882
  🔖 set version to 3.3.0 Niels Lohmann 2018-10-05 10:59:33 +0200
• cd518fbbab
  📝 small update to pass test suite Niels Lohmann 2018-10-05 08:58:38 +0200
• e8427061a0 Thirdparty benchmark: Fix Clang detection. Gregorio Litenstein 2018-10-05 02:01:43 -0300
• b911654857
  📝 updated contributor list Niels Lohmann 2018-10-04 22:30:18 +0200
• bb55885215
  💄 cleaned code Niels Lohmann 2018-10-04 20:42:19 +0200
• 5c7d27c338
  Merge pull request #1272 from antonioborondo/fix_warning Niels Lohmann 2018-10-04 20:33:26 +0200
• b6fdad9acd Remove anonymous namespace Antonio Borondo 2018-10-03 13:51:49 +0100
• 7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope Antonio Borondo 2018-10-03 12:41:34 +0100
• 9ba3f79667 Fix error: explicit specialization in non-namespace scope Antonio Borondo 2018-10-03 12:26:24 +0100
• 8d1585f065 Change implementation to use templates Antonio Borondo 2018-10-03 11:44:02 +0100
• ad3c216bb5 Generate header Antonio Borondo 2018-10-03 10:56:46 +0100
• 0231059290 Fix warning Antonio Borondo 2018-10-03 11:13:35 +0100
• 9f18e17063
  Merge pull request #1270 from chuckatkins/add-more-cmake-docs Niels Lohmann 2018-10-03 10:11:27 +0200
• 53ec0a16f3
  Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings Niels Lohmann 2018-10-02 22:07:18 +0200
• 4c617611e2 docs: Add additional CMake documentation Chuck Atkins 2018-10-01 14:09:31 -0400
• 829571ab5c Turn off additional deprecation warnings for GCC. Chuck Atkins 2018-10-01 10:34:23 -0400
• e6981f9b8d
  Merge e27a9e4203 into c8231eff75 Chuck Atkins 2018-10-01 16:06:05 +0000
• c8231eff75
  Merge pull request #1260 from chuckatkins/fix-cmake-target-alias Niels Lohmann 2018-10-01 17:44:50 +0200
• e27a9e4203 Convert unit testing to use new APIs instead of deprecated ones. Chuck Atkins 2018-10-01 10:34:23 -0400
• 02e653bdf7 docs: add a note in the readme about using the CMake imported target Chuck Atkins 2018-09-27 08:21:19 -0400
• 564506a885 cmake: add import config tests Chuck Atkins 2018-09-26 10:46:34 -0400
• 8c98e9cc7e
  Merge 4b1f2c6e7e into 910a895027 Gregorio Litenstein 2018-09-30 16:48:34 +0000
• 4b1f2c6e7e Make nlohmann friendly for inclusion. Gregorio Litenstein 2018-09-20 02:10:21 -0300
• 1729db85c1 cmake: fix package config to deal with versioning and namespaces Chuck Atkins 2018-09-26 13:08:49 -0400