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

• 06cddd371b
  🔨 removed failing amalgamation test Niels Lohmann 2018-01-14 17:22:42 +0100
• f85f4967fe
  ✅ improved test coverage Niels Lohmann 2018-01-14 17:22:06 +0100
• 6965ff00c8
  Merge branch 'develop' into feature/ubjson Niels Lohmann 2018-01-14 13:58:06 +0100
• 411c16cbb2
  📝 overworked documentation wrt. amalgamation #906 Niels Lohmann 2018-01-14 13:08:28 +0100
• fea5f3792b
  📝 it's 2018 Niels Lohmann 2018-01-14 10:41:59 +0100
• 541b46132d
  ♻️ adjusted code to split headers Niels Lohmann 2018-01-14 10:34:43 +0100
• 0e8f01a963
  Merge branch 'develop' into feature/rfc7396 Niels Lohmann 2018-01-14 10:28:09 +0100
• c772c01a48
  ♻️ refactored code to split headers Niels Lohmann 2018-01-14 10:27:30 +0100
• 1b54d4a5aa
  Merge branch 'develop' into feature/ubjson Niels Lohmann 2018-01-14 10:10:56 +0100
• 420dcf1f25
  🚧 added check whether code is amalgamated Niels Lohmann 2018-01-14 10:10:23 +0100
• 5775084ffc
  cmake: add option to use/install the non-amalgamated version Théo DELRIEU 2018-01-13 13:07:03 +0100
• 84bffd5d36
  move amalgamate tool to third_party folder Théo DELRIEU 2018-01-13 13:05:42 +0100
• 922b56e492
  cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR Théo DELRIEU 2018-01-13 12:27:33 +0100
• a66b2d20c6
  🚨 removed linter warnings for Python code Niels Lohmann 2018-01-13 11:15:23 +0100
• f4a55f26b0
  ➕ added amalgamate Python script Niels Lohmann 2018-01-13 10:59:49 +0100
• 241eea0c0e
  📝 documentation Niels Lohmann 2018-01-12 09:23:33 +0100
• 10bad9381d
  🚧 added size benchmark for binary formats Niels Lohmann 2018-01-10 23:13:48 +0100
• 3a7585e738
  ✅ added more tests Niels Lohmann 2018-01-10 22:47:07 +0100
• 31bfabc4c0
  🔨 optimized input format Niels Lohmann 2018-01-10 16:14:43 +0100
• 965a70e38d
  🔨 optimized output format Niels Lohmann 2018-01-10 11:22:19 +0100
• 85173f5627
  🔨 some clean up Niels Lohmann 2018-01-10 10:18:31 +0100
• ce53537ba2
  ➖ ➕ replaces amalgamation tool Niels Lohmann 2018-01-09 23:15:06 +0100
• 0a2920e0fd
  ♻️ reorganized code Niels Lohmann 2018-01-09 18:30:02 +0100
• b67e00b9b5
  Merge pull request #700 from theodelrieu/refactor/split_it Niels Lohmann 2018-01-09 07:57:01 +0100
• fd04967676
  🐛 fixed copy-paste error Niels Lohmann 2018-01-08 21:37:51 +0100
• fb1154c237
  🚧 debug Niels Lohmann 2018-01-08 21:26:41 +0100
• 97e0d20ce9
  🚧 debug Niels Lohmann 2018-01-08 21:16:20 +0100
• ebf28a26ee
  🚧 another try Niels Lohmann 2018-01-08 20:49:02 +0100
• 7e4ee23f40
  add single_header CMake target Théo DELRIEU 2017-08-14 20:45:33 +0200
• 57d822b6e2
  add missing includes, put back include comments Théo DELRIEU 2017-08-14 19:28:01 +0200
• 9cab30cfce
  add adl_serializer.hpp Théo DELRIEU 2017-08-14 18:22:49 +0200
• 8e9714fe3d
  add detail/json_ref.hpp Théo DELRIEU 2017-08-14 18:14:27 +0200
• a3473fda6a
  add detail/serializer.hpp Théo DELRIEU 2017-08-14 18:04:51 +0200
• c117515e31
  add detail/parsing/binary_writer.hpp Théo DELRIEU 2017-08-14 17:55:06 +0200
• d620f76f0d
  add detail/parsing/binary_reader.hpp Théo DELRIEU 2017-08-14 17:50:24 +0200
• 4dbb433a79
  add detail/parsing/output_adapters.hpp Théo DELRIEU 2017-08-14 17:41:23 +0200
• ae6f66048c
  add detail/iterators/json_reverse_iterator.hpp Théo DELRIEU 2017-08-14 17:29:55 +0200
• 5fc9ef2b90
  add detail/iterators/iteration_proxy.hpp Théo DELRIEU 2017-08-14 17:26:22 +0200
• bf06cf6c22
  add detail/iterators/iter_impl.hpp Théo DELRIEU 2017-08-14 17:23:15 +0200
• 3e65a65290
  add detail/iterators/internal_iterator.hpp Théo DELRIEU 2017-08-14 17:18:07 +0200
• 51ecc31db7
  add detail/iterators/primitive_iterator.hpp Théo DELRIEU 2017-08-14 17:10:32 +0200
• 9ea25685a8
  add detail/parsing/parser.hpp Théo DELRIEU 2017-08-14 17:02:40 +0200
• 3a0743db97
  add detail/parsing/lexer.hpp Théo DELRIEU 2017-08-14 16:54:16 +0200
• 7ab3e8d7b3
  add detail/parsing/input_adapters.hpp Théo DELRIEU 2017-08-14 16:48:55 +0200
• 21881606f2
  add detail/conversions/to_json.hpp Théo DELRIEU 2017-08-14 16:40:38 +0200
• e0c02c14f0
  add detail/conversions/from_json.hpp Théo DELRIEU 2017-08-14 16:33:55 +0200
• 7056b375c4
  add detail/value_t.hpp Théo DELRIEU 2017-08-14 15:58:56 +0200
• 8c555db970
  add detail/exceptions.hpp Théo DELRIEU 2017-08-14 15:19:40 +0200
• f364f5ac5a
  add detail/meta.hpp Théo DELRIEU 2017-08-14 15:06:35 +0200
• d686713f91
  add detail/macro_{un}scope.hpp Théo DELRIEU 2017-08-14 14:59:17 +0200
• 5bffc95773
  add json_fwd.hpp Théo DELRIEU 2017-08-14 14:41:01 +0200
• 3d7658da89
  🚧 working on AppVeyor's errors Niels Lohmann 2018-01-08 19:48:18 +0100
• 126ce2e56c
  🚧 further UBJSON Niels Lohmann 2018-01-08 18:54:17 +0100
• c9938ea838
  🚧 started UBJSON implementation Niels Lohmann 2018-01-07 22:09:12 +0100
• d81eb21384 Merge 1f41287078 into 15b6421d07 Maël Nison 2018-01-06 08:11:07 +0000
• 15b6421d07
  ✅ added UTF-8 decoder capability and stress test Niels Lohmann 2018-01-05 23:26:22 +0100
• 78f8f837e6
  added items() function #874 Niels Lohmann 2018-01-05 18:34:10 +0100
• 96b40b27a5
  📝 fixed Doxygen warnings Niels Lohmann 2018-01-05 18:33:42 +0100
• 927db1f5f9 Merge 8d34ea432f into 337e9824ea Oleg Khabinov 2018-01-04 18:23:58 +0000
• 337e9824ea
  Merge pull request #900 from Dobiasd/patch-1 Niels Lohmann 2018-01-04 17:11:18 +0100
• ba2316372a
  fix link to the documentation of the emplace function Tobias Hermann 2018-01-03 11:06:32 +0100
• a43347e1f9
  Merge branch 'develop' Niels Lohmann 2017-12-29 20:35:02 +0100
• ce1dccf347
  Merge branch 'release/3.0.1' into develop v3.0.1 Niels Lohmann 2017-12-29 20:24:49 +0100
• 5681e55da8
  Merge branch 'release/3.0.1' 3.0.1 Niels Lohmann 2017-12-29 20:24:20 +0100
• 92484f0caf
  🔖 set version to 3.0.1 Niels Lohmann 2017-12-29 18:31:13 +0100
• ebc6849b71
  ✅ added test for #894 Niels Lohmann 2017-12-29 16:53:04 +0100
• 3c76ff353d
  📝 updated docs after PRs Niels Lohmann 2017-12-29 16:52:09 +0100
• d45183d426
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-12-28 13:52:26 +0100
• 3b3b6e8e69
  🚑 fix for #894 Niels Lohmann 2017-12-28 13:52:23 +0100
• f28fc2261a
  Merge pull request #858 from mattismyname/develop Niels Lohmann 2017-12-28 12:13:19 +0100
• 72bff90ed9 🔧 Fix up a few more effc++ items Matthew K. Gumbel 2017-12-04 15:42:08 -0800
• e4c289fb32 Merge faa24a8f59 into 3113a52a7d shamprasadps 2017-12-23 20:09:49 +0000
• 3113a52a7d
  📝 added exception 403 to documentation of at (#888) Niels Lohmann 2017-12-23 18:38:18 +0100
• 184e9c6aa7
  Merge pull request #885 from TinyTinni/develop Niels Lohmann 2017-12-23 11:09:46 +0100
• faa24a8f59 adding a default case for switch shamprasad.ps 2017-12-22 12:03:59 -0700
• a9e1cbb9a5 Changing to typo introduced shamprasad.ps 2017-12-22 10:23:39 -0700
• b8db20e5f6 Handle all enum cases in switch shamprasad.ps 2017-12-22 09:39:10 -0700
• d1cda6888e includes CTest module resp. BUILD_TESTING option Matthias Möller 2017-12-20 17:54:45 +0100
• 8d34ea432f Experimental support for binary type and CBOR (de)serialization Oleg Khabinov 2017-12-07 17:14:09 -0800
• ac66ceeb9c Merge 5e984a2445 into 88ddb12afc sfinktah 2017-12-19 12:18:06 +0000
• 88ddb12afc
  📝 fix for #883 Niels Lohmann 2017-12-18 19:46:53 +0100
• e54b6ace94
  Merge pull request #882 from erengy/fix-msvc-c4819 Niels Lohmann 2017-12-17 19:52:57 +0100
• ab0e8b2f3a
  Fix MSVC warning C4819 Eren Okka 2017-12-17 18:02:55 +0300
• 1ca6ec1dc0
  Merge pull request #880 from nlohmann/coverity_scan Niels Lohmann 2017-12-17 11:24:40 +0100
• 1856f38c85
  📝 removed paragraph on version 3.0.0 Niels Lohmann 2017-12-17 11:22:35 +0100
• afebb6a3bb
  Merge branch 'release/3.0.0' into develop v3.0.0 Niels Lohmann 2017-12-17 11:04:53 +0100
• 9f81beb5e2
  Merge branch 'release/3.0.0' 3.0.0 Niels Lohmann 2017-12-17 11:04:04 +0100
• 106f9f5436
  ⬆️ updated git-update-ghpages script Niels Lohmann 2017-12-17 10:20:30 +0100
• 9eb5e2c271
  🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:40:19 +0100
• 9e3c4ad11f
  🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:31:18 +0100
• 314e4e7699
  📝 improved documentation for dump and iterator_wrapper Niels Lohmann 2017-12-16 23:58:10 +0100
• 9a51fb4da2
  🚨 fixed some warnings Niels Lohmann 2017-12-16 22:19:30 +0100
• 7bf007f2bc
  Merge pull request #879 from nlohmann/feature/algorithms Niels Lohmann 2017-12-16 12:41:07 +0100
• 980795b644
  ✏️ fixed typos Niels Lohmann 2017-12-16 12:37:44 +0100
• f3bd755cab
  ➖ removing <iomanip> header Niels Lohmann 2017-12-16 12:37:25 +0100
• 4c871c58f8
  ✅ re-added tests for algorithms Niels Lohmann 2017-12-16 11:16:34 +0100
• c23f5dcea6
  📝 fixed year Niels Lohmann 2017-12-15 23:49:37 +0100
• 2e1b1061cd
  Merge pull request #875 from nlohmann/feature/spelling Niels Lohmann 2017-12-14 22:31:19 +0100
• 261caec2de
  👥 added contributor image Niels Lohmann 2017-12-14 22:29:39 +0100
• 41780d5495 Merge 08d5d768d2 into f80827d068 zerodefect 2017-12-14 17:17:42 +0000