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

• 3ac2d81a95
  🔨 fixed a MinGW error #1193 Niels Lohmann 2018-08-14 22:13:56 +0200
• be2065dce9
  🚨 fixing a MinGW warning #1192 Niels Lohmann 2018-08-14 22:11:47 +0200
• fed70f6bff
  🎨 reindented code Niels Lohmann 2018-08-14 22:11:08 +0200
• 0e748f2f8c
  Merge pull request #1187 from devsisters/json-internal-catch Niels Lohmann 2018-08-14 21:56:29 +0200
• 861ee400cc
  Merge pull request #1176 from grembo/develop Niels Lohmann 2018-08-14 21:48:49 +0200
• 3ce4325350
  📝 updated documentation of used compilers Niels Lohmann 2018-08-01 22:31:51 +0200
• ba4a19d4af
  👷 added more CI workers Niels Lohmann 2018-08-01 20:59:58 +0200
• 043eff5ba8
  👷 added more CI workers Niels Lohmann 2018-07-31 21:18:33 +0200
• 05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4. Michael Gmelin 2018-07-29 11:57:56 +0200
• d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 Michael Gmelin 2018-07-29 01:29:50 +0200
• 3760a38b7e
  🏁 implicit conversion is not allowed with MSVC Niels Lohmann 2018-07-21 11:47:05 +0200
• 5b14411669
  🏁 trying to fix C2440 error Niels Lohmann 2018-07-21 10:59:00 +0200
• 347e77bdc1
  🚑 fix for #1169 Niels Lohmann 2018-07-21 10:31:55 +0200
• 04372a8c56
  🏁 fix for #1168 Niels Lohmann 2018-07-19 17:31:50 +0200
• d0e60de433 Add new JSON_INTERNAL_CATCH macro function Hyeon Kim 2018-07-19 15:43:41 +0900
• d60f31203d
  Merge 6401c9be2e into 7bfc406ded Nitin Khanna 2018-07-06 05:14:58 +0000
• 7bfc406ded
  📝 added note about CocoaPods #1148 Niels Lohmann 2018-07-05 21:18:46 +0200
• d456a2d777
  Merge pull request #1151 from sonulohani/bigObjFix Niels Lohmann 2018-06-29 09:03:43 +0200
• b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114 Sonu Lohani 2018-06-29 09:34:41 +0530
• 49219d01cf
  Merge 0f71e7acfe into 39dd775e38 graph 2018-06-28 19:32:46 +0000
• 39dd775e38
  🔨 cleanup after #1134 Niels Lohmann 2018-06-28 21:32:32 +0200
• 86a96b059d
  Merge pull request #1134 from Daniel599/feature/items_iterator Niels Lohmann 2018-06-28 21:21:17 +0200
• 0f71e7acfe updated podspec description & other parameters, and removed guide comments Benzakhar Manashirov 2018-06-28 10:25:12 -0400
• 5a2349f06a added integration note for cocoapods in README.md Benzakhar Manashirov 2018-06-27 14:11:53 -0400
• 05557cb3be removed uneccessary comments in nlohmann_json.podspec Benzakhar Manashirov 2018-06-27 13:42:39 -0400
• 230a5feab2 dummy files not needed pod spec lint is passing without them Benzakhar Manashirov 2018-06-27 13:29:39 -0400
• 2909c26a55 cocoapods integration Benzakhar Manashirov 2018-06-27 11:39:04 -0400
• 396a914f9e
  🔨 added macro to disable compiler check #1128 Niels Lohmann 2018-06-26 22:47:40 +0200
• bab5826504
  Merge pull request #1144 from jrakow/cppreference-link-fix Niels Lohmann 2018-06-26 07:58:45 +0200
• 515cfc2d89
  Merge pull request #1142 from jrakow/develop Niels Lohmann 2018-06-24 23:33:30 +0200
• 963d06a13c 📝 fix links to cppreference named requirements Julius Rakow 2018-06-24 22:30:37 +0200
• 9f00db48d9 📝 link to cppreference via HTTPS Julius Rakow 2018-06-24 22:29:33 +0200
• ec2ebd5ec9 meson: add multiple headers target Julius Rakow 2018-06-24 16:53:02 +0200
• 0bb36bb140 meson: fix include directory Julius Rakow 2018-06-23 20:45:00 +0200
• 62457729e8
  📝 mentioned MinGW in README Niels Lohmann 2018-06-24 18:03:59 +0200
• 09c0df4a21
  👷 choosing correct image Niels Lohmann 2018-06-24 17:40:16 +0200
• 1bbc4a0859
  👷 using Ninja to speed up build Niels Lohmann 2018-06-24 17:10:13 +0200
• d8fe13fc83
  🔨 fixed escaping for MinGW Niels Lohmann 2018-06-24 16:57:53 +0200
• e59b930927
  👷 trying a more recent compiler Niels Lohmann 2018-06-24 16:40:47 +0200
• 937d68e2e5
  👷 forgot old PATH Niels Lohmann 2018-06-24 16:37:02 +0200
• 989ad9b759
  👷 using help from https://stackoverflow.com/a/48509334/266378 Niels Lohmann 2018-06-24 16:35:16 +0200
• 067e288289
  👷 set build type Niels Lohmann 2018-06-24 16:29:03 +0200
• 7bbc06b487
  👷 forgot quotes Niels Lohmann 2018-06-24 16:18:44 +0200
• 441e5d87e6
  👷 experimenting with AppVeyor and MinGW Niels Lohmann 2018-06-24 16:17:06 +0200
• 7fa4ddf93e
  💄 fixed indentation Niels Lohmann 2018-06-23 17:27:40 +0200
• bf348ca8a4
  Merge pull request #1028 from gracicot/develop Niels Lohmann 2018-06-23 17:10:04 +0200
• ed6a0686df
  🔨 small refactoring to improve branch coverage Niels Lohmann 2018-06-23 17:05:04 +0200
• c8bfdfd961
  👷 tryping different platforms for AppVeyor Niels Lohmann 2018-06-23 11:12:32 +0200
• c02de445bf
  🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 11:00:42 +0200
• 66dd1a846d
  🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 10:47:55 +0200
• 850922269d
  🚨 removed compiler warnings Niels Lohmann 2018-06-23 10:28:04 +0200
• 0460b90977
  📝 fix for #1052 #1139 Niels Lohmann 2018-06-22 22:35:48 +0200
• 85f35a1d59
  📝 documentation fix Niels Lohmann 2018-06-22 22:34:42 +0200
• e7c1638d11
  💄 cleanup Niels Lohmann 2018-06-18 22:03:46 +0200
• 1c81e9f5ae
  Merge pull request #1130 from agrianius/develop Niels Lohmann 2018-06-18 22:01:53 +0200
• d505ed7b31
  Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion Niels Lohmann 2018-06-18 21:59:46 +0200
• 2c920a1032
  run make amalgamate Théo DELRIEU 2018-06-18 10:53:51 +0200
• 2b37d7ed86
  from_json: add overload for std::unordered_map Théo DELRIEU 2018-06-18 10:53:30 +0200
• 299469cfd5
  from_json: add missing template arguments for std::map Théo DELRIEU 2018-06-18 10:52:11 +0200
• 1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed Danielc 2018-06-16 12:01:49 +0300
• f574d7e084 simplify templates for operators, add more checks Vitaliy 2018-06-13 19:47:29 +0300
• b51492bf9e
  Merge 5e0c024b68 into e830bc502f Ted Lyngmo 2018-06-14 10:25:05 +0000
• 5e0c024b68 Add support for workarounds for non-compliant C++11 compilers Ted Lyngmo 2018-06-14 12:24:00 +0200
• eb44f36e55
  Merge cd28d872e7 into e830bc502f agrianius 2018-06-11 17:52:06 +0000
• f1a139454d
  Merge cd28d872e7 into e830bc502f agrianius 2018-06-11 17:51:05 +0000
• cd28d872e7 forward declarations to make new compilers happy Vitaliy 2018-06-11 20:50:39 +0300
• 3d3055909c define global operator< for const char* and alt_string Vitaliy 2018-06-11 19:09:57 +0300
• e242f4bf5a
  Merge 4feb8211ca into e830bc502f agrianius 2018-06-11 15:06:24 +0000
• 4feb8211ca test (non)equality for alt_string implementation Vitaliy 2018-06-11 18:03:46 +0300
• b8560914e0
  Merge 47acb302d2 into e830bc502f Evan Driscoll 2018-06-06 06:58:36 +0000
• 47acb302d2
  Write stylizer documentation Evan Driscoll 2018-06-06 00:21:02 -0500
• e2974c38e4 Rename fancy->styled Evan Driscoll 2018-06-05 22:51:11 -0500
• 6ce7cc0470 Write documentation on styles Evan Driscoll 2018-06-05 23:01:31 -0500
• fe09e0dd6b Overload 'register_style' template instead of awkward multi-naming Evan Driscoll 2018-06-05 22:25:17 -0500
• d7677fca6f Refactor: some TMP machinery to lead to better overloading Evan Driscoll 2018-06-05 22:04:48 -0500
• 680a85b7a2 Rename 'fancy_serializer_{style,stylizer}' to 'print_{...}' Evan Driscoll 2018-06-04 22:41:11 -0500
• 494be1c445 Refactor: rename the register_style overloads Evan Driscoll 2018-06-04 22:28:58 -0500
• edb6b25569 Fancy printer predicate now takes current JSON object Evan Driscoll 2018-06-04 21:59:21 -0500
• 14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop Guillaume Racicot 2018-06-04 11:18:25 -0400
• 7acd90b651 Fixed check for compatible string type Guillaume Racicot 2018-06-04 11:18:19 -0400
• 5676a2a076
  Aligned template declaration Guillaume Racicot 2018-06-03 23:51:07 -0400
• e0e7fa39e7 Re-added external_constructor with string compatible types Guillaume Racicot 2018-06-03 23:49:13 -0400
• c7a64b8846 Example of more powerful matcher being useful Evan Driscoll 2018-06-03 22:41:42 -0500
• 5f0870ef34 Expose the matcher predicate from fancy stylizer Evan Driscoll 2018-06-03 22:26:38 -0500
• d0eb2f21d3 Refactor: fancy_serializer passes json_pointer to stylizer Evan Driscoll 2018-06-03 22:06:27 -0500
• ca3f3959a8 Refactor: fancy_serializer tracks a json_pointer context Evan Driscoll 2018-06-03 22:02:07 -0500
• 91971e394f Provide accessors into json_pointer Evan Driscoll 2018-06-03 21:52:28 -0500
• 6c746460c6 Add missing header file Evan Driscoll 2018-06-03 21:51:45 -0500
• 860661987f Spaces after commas (in [1, 2]) is controllable separately from multiline Evan Driscoll 2018-06-03 00:02:30 -0500
• e7b02c10dd Spaces after a colon (in {"k": v}) controllable separately from multiline Evan Driscoll 2018-06-03 00:00:12 -0500
• ec756e47ad Refactor: don't indent when multiline is false Evan Driscoll 2018-06-02 23:52:30 -0500
• af8dd92a0c Refactor: introduce explicit multiline control Evan Driscoll 2018-06-02 23:48:26 -0500
• 5e10e97296 Refactor: dump_object_key_value Evan Driscoll 2018-06-02 23:35:38 -0500
• ef679f8988 Fancy serializer: styles continue to propagate if not overridden Evan Driscoll 2018-06-02 23:17:42 -0500
• 186c7df25a Can style subobjects of a object differently, by key Evan Driscoll 2018-06-02 23:10:28 -0500
• 7fa4431474 Refactor and prep: introduce new fancy_serializer_stylizer class Evan Driscoll 2018-06-02 22:44:28 -0500
• 28e7eecf33 Fancy serializer can limit recursion depth Evan Driscoll 2018-06-02 22:22:24 -0500
• cd0c225a50 Use raw literals for multi-line expected results Evan Driscoll 2018-06-02 22:10:16 -0500
• 1c1c789084 Serializer edge case bug fix: very deep indents ignored indent_char Evan Driscoll 2018-06-02 21:34:55 -0500
• a983e47619 Refactor: dump_object no longer splits cases by indent Evan Driscoll 2018-06-02 21:08:53 -0500