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

• bf4d744d1a
  ✅ more tests for meta() call Niels Lohmann 2017-02-26 14:34:58 +0100
• d1b30250d6
  ✅ added missing tests Niels Lohmann 2017-02-26 11:50:52 +0100
• f1cd15ce7e
  ⚡ avoid copying a string Niels Lohmann 2017-02-26 11:22:18 +0100
• 9ff0cc0f02
  📝 updated documentation v2.1.1 Niels Lohmann 2017-02-25 16:43:15 +0100
• b249e7b7b5
  Update Niels Lohmann 2017-02-25 16:42:29 +0100
• 03f06e1993
  Merge branch 'develop' into coverity_scan Niels Lohmann 2017-02-25 16:38:18 +0100
• 1b5867bdcf
  🔀 merge branch 'release/2.1.1' into develop Niels Lohmann 2017-02-25 16:37:28 +0100
• c0d511ea50
  🔀 merge branch 'release/2.1.1' 2.1.1 Niels Lohmann 2017-02-25 16:36:46 +0100
• 27c65b860b
  🔖 version 2.1.1 Niels Lohmann 2017-02-25 16:34:38 +0100
• 0234e53e23
  📝 added section on used third-party tools Niels Lohmann 2017-02-22 20:48:52 +0100
• b49ce351eb
  💄 fixed some warnings Niels Lohmann 2017-02-22 20:48:29 +0100
• a646c9c599
  🔀 merge branch 'cotire' of https://github.com/tusharpm/json into tusharpm-cotire Niels Lohmann 2017-02-22 19:45:10 +0100
• 8cec55a271
  🚧 fixed more warnings Niels Lohmann 2017-02-22 18:14:29 +0100
• 345a106d73
  💄 cleanup Niels Lohmann 2017-02-22 16:56:56 +0100
• 967f9144d4
  🚧 overworked fix for #465 Niels Lohmann 2017-02-21 19:11:34 +0100
• 7d14f167b8
  🚑 fix for #465 Niels Lohmann 2017-02-20 22:48:27 +0100
• b04543ecc5
  🎨 fixed newlines Niels Lohmann 2017-02-20 21:56:10 +0100
• 1a6d7f5bca
  🚧 try to fix some warnings in MSVC Niels Lohmann 2017-02-20 18:32:11 +0100
• f7075be93a
  🐛 reverted change for #464 Niels Lohmann 2017-02-20 18:15:50 +0100
• f2dfa09aec
  🐛 fix for #464 Niels Lohmann 2017-02-20 18:05:52 +0100
• 83a9c60dbd
  🔨 refactored code to avoid using strcpy/strlen/strcat (#463) Niels Lohmann 2017-02-20 17:37:34 +0100
• 716485a965
  🚧 removed decay (#448) Niels Lohmann 2017-02-20 16:27:16 +0100
• 7a4a16a7db
  💄 updated header list Niels Lohmann 2017-02-20 16:20:45 +0100
• 1f72c38861
  🚑 fix for #448 Niels Lohmann 2017-02-19 21:26:53 +0100
• 83f1d2c81b
  ✨ added start index for from_cbor and from_msgpack (#462) Niels Lohmann 2017-02-19 21:17:05 +0100
• 4151f2d297
  ✅ added test with thousands_sep Niels Lohmann 2017-02-19 20:08:01 +0100
• 5b53f03e7c
  Merge branch 'develop' into TurpentineDistillery-feature/locale_independent_num_to_str Niels Lohmann 2017-02-19 19:24:55 +0100
• 9a9d0ba3df
  🚧 fixing warning C4293 (#453) Niels Lohmann 2017-02-19 17:47:20 +0100
• 5436407b7e 👷 Add cmake logic to Travis config - get CMake for XCode 8.1 image Tushar Maheshwari 2017-02-12 19:40:40 +0530
• 85ce4d7b53 ⚡ cmake compile time reduce using cotire Tushar Maheshwari 2017-02-12 17:16:54 +0530
• d1479e47bb
  💄 added assertion message Niels Lohmann 2017-02-18 11:01:03 +0100
• 513eb3ab5f
  🚧 clean up Niels Lohmann 2017-02-18 11:00:18 +0100
• 0200f2dc62
  🚧 fixing warning C4267 (#453) Niels Lohmann 2017-02-17 19:14:21 +0100
• 6408402ad2
  🔀 merge #378 (for #362 and #454) Niels Lohmann 2017-02-16 09:24:45 +0100
• 057b1e606b
  🔀 merged #415 (fix for #414) Niels Lohmann 2017-02-16 08:50:20 +0100
• 2c17c1b1b2
  💄 cleanup Niels Lohmann 2017-02-16 08:01:01 +0100
• 973402c11e
  🚧 replaced throws (#440) and _MAX/_MIN macros (#451) Niels Lohmann 2017-02-15 22:44:18 +0100
• b9f3149451
  🚑 fix for #452 Niels Lohmann 2017-02-15 21:30:28 +0100
• 6bf93b3d06 Merge remote-tracking branch 'upstream/develop' into develop Mihai STAN 2017-02-15 15:00:25 +0200
• 82fb613763
  📝 update after #302 Niels Lohmann 2017-02-14 07:28:30 +0100
• 22b9a301d6 Merge pull request #450 from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num Niels Lohmann 2017-02-14 07:18:35 +0100
• c95ff863bf
  ⬆️ updated Catch to v1.7.2 Niels Lohmann 2017-02-13 18:55:11 +0100
• 265c5b5207
  🔨 more work on the number parser Niels Lohmann 2017-02-13 18:51:23 +0100
• b84705d557
  ✅ improved test coverage Niels Lohmann 2017-02-12 20:14:43 +0100
• c8191c8172
  🔨 further cleanup Niels Lohmann 2017-02-12 18:50:17 +0100
• c2d55109c1
  🔨 make lexer distinguishes number types Niels Lohmann 2017-02-11 16:54:25 +0100
• 9f5dccbab5
  💄 cleanup Niels Lohmann 2017-02-11 15:55:53 +0100
• 926af6d50b
  🔀 merge branch 'develop' into TurpentineDistillery-feature/locale_independent_str_to_num Niels Lohmann 2017-02-11 15:17:47 +0100
• ed8516dc39
  👷 added Codacy badge Niels Lohmann 2017-02-09 17:38:02 +0100
• c485d46cea
  📝 screenshoots look ugly Niels Lohmann 2017-02-08 20:00:46 +0100
• 6fd77cea4a
  📝 added screenshots Niels Lohmann 2017-02-08 19:22:19 +0100
• 0ffa18aab8
  📝 listing projects using the library Niels Lohmann 2017-02-08 19:16:38 +0100
• 662a9b8f3c
  ✏️ fixed more typos Niels Lohmann 2017-02-08 18:19:41 +0100
• 4746a4c536
  💄 minor change Niels Lohmann 2017-02-08 17:56:43 +0100
• 163f8397fd ✏️ fixed a typo #446 Niels Lohmann 2017-02-05 17:11:26 +0100
• 8d88a1da2a 🔀 merged #379 and fixed conflicts Niels Lohmann 2017-02-05 13:13:41 +0100
• d284c86dd1 ✅ uncommented some tests Niels Lohmann 2017-02-04 21:00:41 +0100
• 922fe693e1 ⬆️ updated Catch to v1.7.0 Niels Lohmann 2017-02-04 15:30:28 +0100
• 1cfdc2a753 🐛 fixed test compilation Niels Lohmann 2017-02-04 08:25:55 +0100
• 77d6f70602 📝 acknowledgments for #442 and #445 Niels Lohmann 2017-02-03 18:28:22 +0100
• d6afaa8e16 📝 fixing a documentation issue #442 Niels Lohmann 2017-02-03 18:15:37 +0100
• 5976caf032 ⚡ improved test compilation speed #445 Niels Lohmann 2017-02-03 18:09:55 +0100
• 16af771277 ✅ added roundtrip test for the Big List of Naughty Strings Niels Lohmann 2017-02-01 17:34:39 +0100
• bf8fdac99a 👷 dropped Doozer.io support Niels Lohmann 2017-02-01 16:41:05 +0100
• 7bb7033383 Merge branch 'develop' into coverity_scan Niels Lohmann 2017-02-01 16:03:51 +0100
• c75865d88c 🐛 fixed -Weffc++ warnings Niels Lohmann 2017-02-01 15:13:21 +0100
• 1638de2abc Compilation issue with g++-7 (experimental) ibroheem 2017-01-31 18:35:45 +0100
• b210f2dbf4 💄 minor refactoring Niels Lohmann 2017-01-29 21:40:37 +0100
• 0164b10e10 ✅ added missing tests found by mutate++ Niels Lohmann 2017-01-29 17:18:56 +0100
• affa3bf4e9 Merge pull request #439 from jaredgrubb/patch-2 Niels Lohmann 2017-01-29 08:18:44 +0100
• f2873e6d3a README: adjust boost::optional example Jared Grubb 2017-01-29 02:46:58 +0000
• c7f366520c Merge branch 'develop' into coverity_scan Niels Lohmann 2017-01-28 18:43:48 +0100
• f642934b18 🔀 merge branch 'release/2.1.0' into develop v2.1.0 Niels Lohmann 2017-01-28 18:43:01 +0100
• 1e99a0273f 🔀 merge branch 'release/2.1.0' 2.1.0 Niels Lohmann 2017-01-28 18:42:27 +0100
• 6746a57524 📝 updated slides Niels Lohmann 2017-01-28 18:41:30 +0100
• 1bcc76d903 Update Niels Lohmann 2017-01-28 18:24:07 +0100
• eb08e8b09b 📝 updated documentation Niels Lohmann 2017-01-28 18:20:12 +0100
• 4b5c61075f 📄 changes to let Github detect the license Niels Lohmann 2017-01-28 18:17:57 +0100
• 38e4935db0 📝 added example and documentation for the meta function Niels Lohmann 2017-01-28 17:12:29 +0100
• cdde1a9436 🔖 set version to 2.1.0 Niels Lohmann 2017-01-28 16:46:03 +0100
• d870826811 🔖 set version to 2.1.0 Niels Lohmann 2017-01-28 16:03:35 +0100
• 2f6260751c 📝 fixed #434 Niels Lohmann 2017-01-27 18:50:52 +0100
• 42fa3f0568 🔀 merge pull request #435 (based on #338, #355, and #423) Niels Lohmann 2017-01-27 06:22:10 +0100
• cd9701b123 💄 cleanup Niels Lohmann 2017-01-26 20:51:30 +0100
• 1305e03557 📝 fixed documentation Niels Lohmann 2017-01-26 19:39:34 +0100
• 77bb7af5d9 📝 added more documentation Niels Lohmann 2017-01-26 07:29:37 +0100
• 4d3053cd42 💄 some cleanup Niels Lohmann 2017-01-25 22:21:07 +0100
• 94d9b7bc86 📝 overworked documentation (re-added constructor examples) Niels Lohmann 2017-01-25 21:59:54 +0100
• ec03c9c53e 📝 overworked docs #435 Niels Lohmann 2017-01-25 19:01:31 +0100
• 6198439f59 fix #414 - comparing to 0 literal Mihai STAN 2017-01-03 00:49:33 +0200
• 4139bb6572 📝 adjusted test count Niels Lohmann 2017-01-24 15:20:20 +0100
• c154f3133d 🚧 rephrased assertions Niels Lohmann 2017-01-24 15:02:35 +0100
• 50a3f3b301 📝 added nicer example Niels Lohmann 2017-01-24 14:55:51 +0100
• 781fd09f2d 📝 cleanup Niels Lohmann 2017-01-24 14:45:32 +0100
• daf8dcdb32 📝 overworked README Niels Lohmann 2017-01-24 14:37:25 +0100
• 6fda906da8 Merge 32ade498f9 into ce0b3fe5a3 Syahmi Azhar 2017-01-24 13:32:26 +0000
• 250e5bf43d 💄 overworked documentation and indentation Niels Lohmann 2017-01-24 13:47:33 +0100
• 030cf674ef 🚧 fixed a warning Niels Lohmann 2017-01-24 12:49:38 +0100
• 3857e55290 💄 ran "make pretty" Niels Lohmann 2017-01-24 12:43:43 +0100
• 3202dcf0f0 Merge 9f103d19d7 into 145188f264 Théo DELRIEU 2017-01-22 13:23:45 +0000