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

• 7a5b92a1c1 Make nlohmann friendly for inclusion. Gregorio Litenstein 2018-09-20 02:10:21 -0300
• 910a895027
  Merge pull request #1238 from theodelrieu/fix/1237 Niels Lohmann 2018-09-29 14:50:54 +0200
• 1fae82b7a7
  Merge branch 'develop' into fix/1237 Niels Lohmann 2018-09-29 14:50:36 +0200
• 22e55349a6
  📝 added Wandbox link #1227 Niels Lohmann 2018-09-29 14:33:39 +0200
• 70e587c3da
  📝 added Wandbox link #1227 Niels Lohmann 2018-09-29 14:33:21 +0200
• d26f39466e
  Merge pull request #1231 from theodelrieu/feature/get_with_parameter Niels Lohmann 2018-09-29 14:30:04 +0200
• c61a9071ae
  🚨 fixed a compilation issue with ICPC #755 Niels Lohmann 2018-09-29 11:50:14 +0200
• e8730e5e82 BSON: Reworked binary_reader::get_bson_cstr() Julian Becker 2018-09-29 11:50:01 +0200
• b59a58406e
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-09-29 11:48:52 +0200
• 4e54c9a13d
  🚨 fixed a compilation issue with ICPC #755 Niels Lohmann 2018-09-29 11:48:49 +0200
• 1da5ac6d09
  Merge 53420cbe01 into 95432c34f9 zakalibit 2018-09-29 09:38:14 +0000
• 0a09db9cc2 BSON: Extend binary_reader::get_number to be able to hanlde little endian input to get rid of binary_reader::get_number_little_endian Julian Becker 2018-09-29 11:33:01 +0200
• 95432c34f9
  Merge pull request #1262 from knilch0r/patch-1 Niels Lohmann 2018-09-29 10:58:10 +0200
• 8c1387cfb3
  unit-testsuites.cpp: fix hangup if file not found knilch 2018-09-28 11:33:23 +0200
• 521fe49fec
  Add basic_json::get_to function. Théo DELRIEU 2018-09-10 12:56:24 +0200
• 680a4ab672
  Merge pull request #1257 from henryiii/gcc48 Niels Lohmann 2018-09-28 10:05:17 +0200
• 7a37ba0c02 Adding 4.8 test to travis Henry Fredrick Schreiner 2018-09-25 18:15:29 +0200
• ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage Julian Becker 2018-09-25 20:34:25 +0200
• 99b7c7c8ef Patch nlohmann/json for GCC 4.8 Chris Harris 2018-09-20 11:19:33 -0400
• bce4816275 BSON: Added test case for the different input/output_adapters Julian Becker 2018-09-24 23:35:19 +0200
• 763705c2a7 Fix: Add missing begin() and end() member functions to alt_string Julian Becker 2018-09-24 19:29:39 +0200
• e184b6ecf2
  Merge pull request #1252 from koponomarenko/fix-meson-build Niels Lohmann 2018-09-22 14:49:03 +0200
• 88b055c2df
  Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround Niels Lohmann 2018-09-22 14:14:56 +0200
• 8799759b85 Add version and license to meson.build Kostiantyn Ponomarenko 2018-09-20 21:54:10 +0300
• fdfc240bb2
  use a zip archive with everything inside for tests Théo DELRIEU 2018-09-20 18:17:02 +0200
• c3d07d39af
  use CMake ExternalData for benchmark data files Théo DELRIEU 2018-09-20 14:30:08 +0200
• 423edf0fdb
  use CMake ExternalData for test data files Théo DELRIEU 2018-09-20 14:12:51 +0200
• 4e52277b70
  Fix issue #1237 Théo DELRIEU 2018-09-12 17:01:27 +0200
• e4bc98d036
  Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility Niels Lohmann 2018-09-19 20:46:51 +0200
• 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently. David Guthrie 2018-09-18 16:38:59 -0400
• 3b1a5cafad Use a version check to provide backwards comatible imported target names. Chuck Atkins 2018-09-18 13:59:19 -0400
• 99939d6340
  📝 added lgtm.com badge Niels Lohmann 2018-09-18 19:27:52 +0200
• 4e2f35d4c2
  👷 adding Xcode 10 worker Niels Lohmann 2018-09-18 19:22:30 +0200
• 7fa3b8865c
  Merge pull request #1221 from rivertam/better-error-305 Niels Lohmann 2018-09-18 12:49:07 +0200
• 8f07ab6392 Replace "key-style argument" with "string argument" Ben Berman 2018-09-17 15:36:38 -0400
• df33a90774 BSON: Bugfix for non-empty arrays Julian Becker 2018-09-15 14:08:38 +0200
• cf485c2907 BSON: Support for arrays Julian Becker 2018-09-15 13:54:08 +0200
• 120d1d77d4 BSON: test case for a more complex document Julian Becker 2018-09-15 13:40:20 +0200
• 5ce7d6bdd7 BSON: support objects with objects as members Julian Becker 2018-09-15 13:03:42 +0200
• 83b427ad67 BSON: unsigned integers Julian Becker 2018-09-15 12:11:21 +0200
• c0d8921a67 BSON: support objects with int64 members Julian Becker 2018-09-15 12:00:53 +0200
• 7ee361f7ad BSON: support objects with int32 members Julian Becker 2018-09-15 11:54:17 +0200
• c5ef023171 BSON: support objects with null members Julian Becker 2018-09-15 11:38:26 +0200
• 6c447de076 BSON: Support objects with string members Julian Becker 2018-09-15 11:33:24 +0200
• 0c0f2e44b5 BSON: support doubles Julian Becker 2018-09-15 03:23:54 +0200
• 9a0dddc5d2 BSON: Object with single boolean Julian Becker 2018-09-15 03:08:50 +0200
• 5f5836ce1c BSON: Support empty objects Julian Becker 2018-09-15 00:43:39 +0200
• f06c8fd8e3 BSON: serialization of non-objects is not supported Julian Becker 2018-09-14 22:58:22 +0200
• 186c747a19
  Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix Niels Lohmann 2018-09-10 20:52:11 +0200
• 90ed0fc87e
  Merge 9676e86433 into ebb3c03293 Knut Tidemann 2018-09-10 13:21:26 +0000
• 9676e86433 tests: ignore deprecated declarations warnings in GCC. Knut Andre Tidemann 2018-09-10 15:12:42 +0200
• 6b5334c167 Move lambda out of unevaluated context mandreyel 2018-09-10 10:02:38 +0200
• ebb3c03293
  🎨 cleanup after #1228 Niels Lohmann 2018-09-09 18:19:33 +0200
• d3428b35c5
  Merge pull request #1228 from theodelrieu/remove_static_asserts Niels Lohmann 2018-09-09 18:12:43 +0200
• aea648bb7a
  remove now-useless traits. check for is_basic_json where needed Théo DELRIEU 2018-09-07 12:42:49 +0200
• 4b4bbceebf
  make from_json SFINAE-correct Théo DELRIEU 2018-09-06 16:54:42 +0200
• f7971f04a5
  make to_json SFINAE-correct Théo DELRIEU 2018-09-06 16:08:01 +0200
• f7c8a2145a
  refactor from/to_json(CompatibleArrayType) Théo DELRIEU 2018-09-05 17:59:10 +0200
• 628f76729e
  do not check for compatible_object_type in compatible_array_type Théo DELRIEU 2018-09-05 17:26:32 +0200
• 29f72966c3
  refactor is_compatible_type, remove conjunction & co Théo DELRIEU 2018-09-05 17:01:52 +0200
• 77967e6548
  refactor is_compatible_integer_type Théo DELRIEU 2018-09-05 16:56:45 +0200
• 13760857ff
  refactor is_compatible_array_type Théo DELRIEU 2018-09-05 16:49:27 +0200
• 924e95c6e8
  refactor is_compatible_string_type Théo DELRIEU 2018-09-05 16:42:55 +0200
• e84195ab7b
  refactor is_compatible_object_type Théo DELRIEU 2018-09-05 16:35:30 +0200
• b59c3367c9
  use detected instead of has_* traits Théo DELRIEU 2018-09-05 16:02:13 +0200
• 1ea8cd128c
  fix void_t for older compilers Théo DELRIEU 2018-09-07 12:15:35 +0200
• eb30ff0615
  🚨 fixed a compiler warning #1224 Niels Lohmann 2018-09-06 07:25:19 +0200
• 53420cbe01
  Merge pull request #1 from zakalibit/zakalibit-compiler-warning-patch zakalibit 2018-09-01 11:15:21 +0100
• 4d94757e15
  Fix compiler warning. zakalibit 2018-09-01 11:14:31 +0100
• ad053ef09c Fix tests for improved error 305(hopefully) Ben Berman 2018-08-30 13:19:09 -0400
• bbdfe7dea6 Improve error messages for error 305 Ben Berman 2018-08-30 12:35:51 -0400
• 21febe645a Neglected to run amalgamate before running checks... it wasn't obvious that was necessary. efp 2018-08-26 11:23:33 -0600
• 1c8094d395
  Merge 435fc32a69 into d713727f22 Andreas C. Osowski 2018-08-25 14:38:49 +0000
• d713727f22
  Merge pull request #1202 from dennisfischer/develop Niels Lohmann 2018-08-25 10:56:30 +0200
• 04597c3a66
  Merge pull request #1214 from devsisters/fix-1213 Niels Lohmann 2018-08-24 17:54:28 +0200
• aada309f61
  Fix #1213 Hyeon Kim 2018-08-24 21:52:24 +0900
• fda01d7575 Ran amalgamate efp 2018-08-23 12:24:31 -0600
• 349b19b84f Added input_position struct to record char, line, and column Added line and column number to parse error efp 2018-08-23 10:31:06 -0600
• 359f98d140
  Merge branch 'release/3.2.0' into develop v3.2.0 Niels Lohmann 2018-08-20 19:36:25 +0200
• 8c20571136
  Merge branch 'release/3.2.0' 3.2.0 Niels Lohmann 2018-08-20 19:36:10 +0200
• dfe607c6ff Export package to allow builds without installing Dennis Fischer 2018-08-20 09:23:12 +0200
• 9f3857ef6f
  🔖 set version to 3.2.0 Niels Lohmann 2018-08-18 18:46:15 +0200
• 7608a64e1e
  🔨 fixed amalgamation Niels Lohmann 2018-08-18 18:14:12 +0200
• a7b02bdce0
  🔖 preparing 3.2.0 release Niels Lohmann 2018-08-18 17:48:49 +0200
• c6a482b16c
  📝 added example for sax_parse Niels Lohmann 2018-08-18 15:42:18 +0200
• 5ad52f4167
  ⬆️ Catch 1.12.0 Niels Lohmann 2018-08-18 12:02:12 +0200
• 3811daa8a3
  📝 release preparation Niels Lohmann 2018-08-18 12:00:14 +0200
• 6899fa304c
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-08-18 08:15:06 +0200
• 57faaf42ca
  🚨 fixed a compiler warning Niels Lohmann 2018-08-18 08:15:03 +0200
• f78ac4fbd3
  Merge pull request #1200 from thyu/develop Niels Lohmann 2018-08-18 08:14:04 +0200
• 3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax Tsz-Ho Yu 2018-08-18 01:12:19 +0100
• e33b31e6aa
  🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) Niels Lohmann 2018-08-17 23:09:45 +0200
• b5c54b41fd
  📝 overworked documentation Niels Lohmann 2018-08-16 21:53:47 +0200
• 07494e06d7
  🚨 fixed some compiler warnings Niels Lohmann 2018-08-16 18:20:30 +0200
• d5b21b051c
  Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax Niels Lohmann 2018-08-16 17:47:55 +0200
• 0cc3db4f15
  add static_asserts on SAX interface Théo DELRIEU 2018-07-24 14:47:41 +0200
• 38f8a51a8f
  use abstract sax class in parser tests Théo DELRIEU 2018-08-16 10:52:33 +0200
• 9bbb133094
  remove no_limit constant and default values Théo DELRIEU 2018-07-24 13:09:08 +0200
• 442886d040
  use templates in the sax interface instead of virtuals Théo DELRIEU 2018-07-02 10:14:37 +0200
• f6febbe359
  split meta.hpp, add detected_t (used to define concepts) Théo DELRIEU 2018-07-24 13:22:44 +0200