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

• 22c733e6fe
  📝 added documentation Niels Lohmann 2019-03-17 22:25:18 +0100
• 56f6d1d68e
  💚 fix CI and #1521 Niels Lohmann 2019-03-17 15:20:22 +0100
• df0f7f2b5d
  👷 overworked clang-tidy target Niels Lohmann 2019-03-17 12:02:23 +0100
• 9f26dac9b3
  ⬆️ updated Doxyfile Niels Lohmann 2019-03-17 12:02:05 +0100
• b8451c236f
  🚨 fixed warnings Niels Lohmann 2019-03-17 12:01:49 +0100
• d6c4cd3b6d
  🚨 adding targets for static analyzers Niels Lohmann 2019-03-17 00:30:08 +0100
• baf8b4be7c
  ➕ adding cpplint Niels Lohmann 2019-03-17 00:28:14 +0100
• 34f8b4f711
  🚨 fixed more warnings Niels Lohmann 2019-03-17 00:27:44 +0100
• 02b3494711
  🔥 removing unstable macOS builds on Traivs Niels Lohmann 2019-03-16 08:28:44 +0100
• b02ee16721
  🚨 fixed warnings Niels Lohmann 2019-03-15 15:55:52 +0100
• 8d6c033f80
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-15 14:55:15 +0100
• 27011e3718
  🚨 fixed warnings Niels Lohmann 2019-03-15 14:55:13 +0100
• 9dc3552931
  Merge pull request #1514 from naszta/macrofix Niels Lohmann 2019-03-15 12:46:42 +0100
• 0067ea8f9e Change macros to numeric_limits #1483 Ferenc Nasztanovics 2019-03-13 23:42:46 +0100
• 0c65ba960e
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-13 22:14:57 +0100
• 546e2cbf5e
  🚨 fixed some warnings Niels Lohmann 2019-03-13 22:14:53 +0100
• c6fc902184
  Merge pull request #1489 from andreas-schwab/develop Niels Lohmann 2019-03-13 11:57:58 +0100
• d39842e68f
  Merge pull request #1330 from ax3l/topic-installEmbed Niels Lohmann 2019-03-13 11:13:09 +0100
• 670f42b561
  🔥 removing Xcode 6.4 builder Niels Lohmann 2019-03-11 22:59:22 +0100
• c983b67112
  Merge pull request #1469 from garethsb-sony/json_pointer-append Niels Lohmann 2019-03-11 22:47:08 +0100
• c11bead2ae
  👷 removing more retired Travis images Niels Lohmann 2019-03-11 21:22:30 +0100
• 3cd1dac653
  🚨 fix MSVC warning #1502 Niels Lohmann 2019-03-11 15:33:23 +0100
• cabe2357b8
  Merge pull request #1492 from stac47/fix_gcc9_allocator Niels Lohmann 2019-03-11 15:21:54 +0100
• 16d9cdce45
  📝 updated documentation of CI Niels Lohmann 2019-03-11 15:19:50 +0100
• e3729ba0a5
  💚 fix compiler selection Niels Lohmann 2019-03-11 07:44:40 +0100
• e5c7fd488d
  👷 trying new Travis workers Niels Lohmann 2019-03-10 22:56:14 +0100
• 5047c7a217
  🐛 added missing include #1500 Niels Lohmann 2019-03-10 22:26:57 +0100
• 8eb7db7277
  Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if Niels Lohmann 2019-03-10 22:08:16 +0100
• 393410e61a
  Merge pull request #1495 from njlr/patch-1 Niels Lohmann 2019-03-10 22:03:49 +0100
• 30edcaab3a
  Merge pull request #1496 from lieff/develop Niels Lohmann 2019-03-10 22:01:52 +0100
• 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670 lieff 2019-02-25 16:38:22 +0300
• bb22b1003f Do proper endian conversions Andreas Schwab 2019-02-21 11:55:21 +0100
• 8aeee4f7e3
  Update README.md njlr 2019-02-25 09:44:38 +0000
• d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer garethsb-sony 2019-02-25 09:25:02 +0000
• 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) garethsb-sony 2019-02-25 09:10:45 +0000
• 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path garethsb-sony 2019-02-25 08:57:12 +0000
• ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) Laurent Stacul 2019-02-22 16:05:41 +0000
• 21516f2bae
  Merge pull request #1491 from nickaein/patch-1 Niels Lohmann 2019-02-22 09:50:45 +0100
• 74ebbd2912 Make library buildable with -Werror=effc++ Florian Kauer 2019-02-21 11:12:24 +0100
• df42d48259 Improve readability by restructuring nested code blocks into their own functions mistersandman 2019-02-21 22:34:40 +0100
• 088a245218
  Fix typo in README.ME Isaac Nickaein 2019-02-22 01:05:00 +0330
• e326df211b
  Merge pull request #1474 from nickaein/develop Niels Lohmann 2019-02-13 13:05:21 +0100
• c55cacee1e
  Merge pull request #1477 from nickaein/fix-doc Niels Lohmann 2019-02-13 13:03:46 +0100
• e93f305494 Add unit-test for contains() member function Isaac Nickaein 2019-02-10 16:42:01 +0330
• 6a5db00951 Implement contains() to check existence of a key Isaac Nickaein 2019-02-10 16:40:30 +0330
• fb5ceb26ac Fix documentation Isaac Nickaein 2019-02-11 17:00:48 +0330
• 46ff13d39e
  Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple Niels Lohmann 2019-02-10 21:50:12 +0100
• eee3bc0c79
  Merge pull request #1464 from elvisoric/update_meson_install_step Niels Lohmann 2019-02-10 21:48:20 +0100
• 5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string garethsb-sony 2019-01-31 23:39:12 +0000
• c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path garethsb-sony 2019-01-31 19:15:36 +0000
• 45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element past-due 2019-01-30 12:59:50 -0500
• 77d1d37290 Disable installation when used as meson subproject. #1463 Elvis Oric 2019-01-30 11:40:06 +0100
• 372c4d2125
  Merge branch 'develop' into iterate-on-destruction Isaac Nickaein 2019-01-28 02:41:22 +0330
• 86838c95dc removed zero-length-array tests from msvc build Francois Chabot 2019-01-27 13:05:12 -0500
• 87ec44b0c4 address platform inconsistency when testing zero-length arrays Francois Chabot 2019-01-25 14:53:21 -0500
• 68ec3eb8d6
  Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon Niels Lohmann 2019-01-25 13:36:18 +0100
• de14b5ee2f
  Merge pull request #1455 from wythe/patch-2 Niels Lohmann 2019-01-25 13:36:07 +0100
• cca6d0dbae
  docs: README type Mark Beckwith 2019-01-24 10:49:45 -0600
• a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer Patrick Boettcher 2019-01-24 16:46:51 +0100
• 584252083a lint and amalgamate Francois Chabot 2019-01-22 17:23:29 -0500
• fb86e6da29 added zero-length array check, and better test coverage Francois Chabot 2019-01-22 17:15:59 -0500
• f76291cd3b corrected lexer comment w/ regard to null null chars Francois Chabot 2019-01-22 15:00:26 -0500
• 78cc0f11cd Corrected erroneous comment about string literals Francois Chabot 2019-01-22 14:42:39 -0500
• 848cf728c0 correct std::array tests to account for corrected behaviors Francois Chabot 2019-01-22 14:37:32 -0500
• 9dc7b666e7 ignore the last character of a character array if it is the null character Francois Chabot 2019-01-22 14:28:46 -0500
• dc21cbb751
  remove extra semicolon Matěj Plch 2019-01-22 10:13:12 +0100
• e89c946451
  Merge branch 'feature/nodiscard' into develop Niels Lohmann 2019-01-20 15:41:30 +0100
• 6de4df23e4
  🐛 fixed integer overflow in dump function #1447 Niels Lohmann 2019-01-20 12:26:01 +0100
• e17e0d031f
  Merge pull request #1446 from scinart/develop Niels Lohmann 2019-01-20 12:18:02 +0100
• e36593e960
  🔨 trying code from https://godbolt.org/z/-tLO1K Niels Lohmann 2019-01-20 11:12:20 +0100
• 20db020c1f move newly-added tests in unit-regression.cpp scinart 2019-01-19 11:36:50 -0500
• d359fd3a8d
  🚧 trying nodiscard attribute #1433 Niels Lohmann 2019-01-19 17:32:23 +0100
• b9a39b38bf
  Merge pull request #1434 from pboettch/develop Niels Lohmann 2019-01-19 17:07:36 +0100
• 83e84446d6
  fix typo scinart 2019-01-18 20:55:01 -0500
• 899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT scinart 2019-01-18 20:27:49 -0500
• c549d648cf Added object_t::key_type and object_t::mapped_type aliases. Francois Chabot 2019-01-16 10:27:29 -0500
• 4fd9b52fc2 Use C++11 features supported by CMake 3.1. Ivor Wanders 2019-01-16 08:21:49 -0500
• 9763333e63 Revert "buildsystem: relax requirement on cmake version" Yann E. MORIN 2019-01-15 22:32:53 +0100
• dffae1082f
  Merge pull request #1435 from pboettch/warning-fix Niels Lohmann 2019-01-15 22:18:13 +0100
• 851fe8a5ef
  Merge pull request #1430 from nicoddemus/conda-docs Niels Lohmann 2019-01-15 22:16:49 +0100
• a2c074fd4d this should really fix the XCode 6/7 builds onqtam 2019-01-15 22:58:12 +0200
• 3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled onqtam 2019-01-15 22:48:37 +0200
• 2f44ac1def moved from Catch to doctest for unit tests onqtam 2019-01-13 18:41:21 +0200
• f0883dda8f During destruction, flatten children of objects to avoid recursion Isaac Nickaein 2019-01-15 20:28:01 +0330
• 47fe4b9cee Add unit test for parsing deeply-nested array Isaac Nickaein 2019-01-15 20:22:11 +0330
• d0c0d16110 🚨 fixed unused variable warning Patrick Boettcher 2019-01-15 15:21:02 +0100
• 9225cf2f57 allow push_back() and pop_back() calls on json_pointer Patrick Boettcher 2019-01-15 14:39:06 +0100
• b025d66eb5 Add instructions about using nlohmann/json with the conda package manager Bruno Oliveira 2019-01-14 16:57:17 -0200
• 17f59bf56e Use emplace_back instead of push_back mistersandman 2019-01-15 11:45:10 +0100
• d5ac351426 Explicit iterative destruction of JSON containers (objects and arrays) instead of implicit recursive destruction in order to avoid stack overflows for deeply nested hierarchies mistersandman 2019-01-14 21:16:43 +0100
• e5753b14a8
  🚨 fixed another linter warning #1400 Niels Lohmann 2019-01-13 15:40:49 +0100
• 5c04cc1009
  🔨 fixed includes Niels Lohmann 2019-01-13 15:31:22 +0100
• 8e9ad346d9
  🚨 fixed another linter warning Niels Lohmann 2019-01-13 13:00:54 +0100
• ad01736d55
  💡 improved documentation for parsing without exceptions #1405 Niels Lohmann 2019-01-13 11:46:05 +0100
• 70f8af1fc9 buildsystem: fix support for cmake older than 3.8 Yann E. MORIN 2019-01-13 11:33:12 +0100
• 06731b14d7
  ⬆️ upgraded Catch and Google Benchmark Niels Lohmann 2019-01-13 11:29:39 +0100
• daeb48b01a
  Merge pull request #1411 from nickaein/develop Niels Lohmann 2019-01-13 11:11:51 +0100
• 29a03f465e
  Merge pull request #1414 from nickaein/mydevel-appveyor-x64 Niels Lohmann 2019-01-12 23:09:19 +0100
• c9dd260a4c Add unit tests for dump_integer Isaac Nickaein 2019-01-01 12:49:51 -0800
• be9b4cbd60 Add benchmark for small integers Isaac Nickaein 2019-01-01 07:45:58 -0800