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

• 548a76e94a Fixed precision issue that caused double->text->double round trip conversions to be inexact jean 2016-02-11 00:24:19 +0100
• 61fe90f998 Merge pull request #205 from nlohmann/issue204 Niels 2016-02-10 21:41:55 +0100
• a831c787df try to replace std::ptrdiff_t with auto (for #204) Niels 2016-02-10 21:19:31 +0100
• 4cc4b26dd2 try to replace ssize_t occurrences with std::ptrdiff_t (for #204) Niels 2016-02-10 21:09:52 +0100
• 1cc4717582 tried Clang 3.9 Niels 2016-02-09 21:26:40 +0100
• be20555985 removed gitter Niels 2016-02-07 17:24:51 +0100
• 236b7afff5 updated and fixed online version Niels 2016-02-07 15:07:17 +0100
• 64281e7980 Update Niels 2016-02-07 14:57:42 +0100
• fdfb39d949 improved documentation Niels 2016-02-07 14:55:29 +0100
• 3b776c08c7 clarified documentation Niels 2016-02-07 10:45:52 +0100
• 8b1a777d36 reverted change wrt. Erasable concept Niels 2016-02-05 22:37:28 +0100
• 6658f4ce01 Update Niels 2016-02-05 22:33:55 +0100
• 2ff2e10660 checking Erasable concept Niels 2016-02-05 22:30:37 +0100
• ae5bd307a2 improved documentation Niels 2016-02-05 22:30:25 +0100
• 57067786d6 Update Niels 2016-02-05 19:33:31 +0100
• 2c720b26ab added a constructor from an input stream Niels 2016-02-05 19:24:42 +0100
• 104c4b5286 improve code coverage Niels 2016-01-31 15:04:38 +0100
• 5e75d25773 Update Niels 2016-01-31 13:08:54 +0100
• 6aa881988d improved documentation Niels 2016-01-31 13:05:39 +0100
• b4da62ee89 Update Niels 2016-01-30 22:07:50 +0100
• 22127a4b85 moved documentation to index markdown file Niels 2016-01-30 22:05:01 +0100
• 740239cef8 added a note about GCC 4.8 (#163) Niels 2016-01-30 21:17:08 +0100
• 36719fdb18 using re2c 0.16 (minimized automaton) Niels 2016-01-30 20:33:31 +0100
• 124e3bc653 Update Niels 2016-01-30 20:25:28 +0100
• 9d063d90e3 removed "using namespace" from examples Niels 2016-01-30 20:23:14 +0100
• ade2f7c92d updated ChangeLog Niels 2016-01-30 16:51:53 +0100
• 2224435f9b cleanup after #200 Niels 2016-01-30 13:36:15 +0100
• cd44e43457 Merge pull request #200 from twelsby/issue199 Niels 2016-01-30 13:32:22 +0100
• 9b4eb1447b Merge e9517958a3 into ff6f723195 twelsby 2016-01-30 07:58:29 +0000
• e9517958a3 Merge get_number()/get_integer() + changes suggested by @gregmarr Trevor Welsby 2016-01-30 17:58:02 +1000
• 21a00fccc8 Shift integer parsing to guess_type() and rename to get_integer() Trevor Welsby 2016-01-30 11:55:11 +1000
• 561accb068 Fixed issue #199 Trevor Welsby 2016-01-30 12:41:12 +1000
• 7d08aa759b Implement bitfields for better readability over masks Trevor Welsby 2016-01-29 18:52:25 +1000
• f35f60c844 Change parse to record float precision Trevor Welsby 2016-01-27 12:53:56 +1000
• ff6f723195 removed token Niels 2016-01-26 23:30:51 +0100
• 3dfa56795f added note Niels 2016-01-26 23:27:07 +0100
• 1c80c2231f linked releases in ChangeLog Niels 2016-01-26 23:10:52 +0100
• 89b07bd3af added (generated) changelog Niels 2016-01-26 22:59:57 +0100
• 91c58a77a1 added Gitter to Travis Niels 2016-01-26 21:49:20 +0100
• fb239fe645 trying Gitter Niels 2016-01-26 21:42:51 +0100
• 52ac56c33e Add Gitter badge The Gitter Badger 2016-01-26 20:38:59 +0000
• c7fc1163f8 Update Niels 2016-01-26 20:09:25 +0100
• 2468631dc9 overworked examples Niels 2016-01-26 20:07:03 +0100
• 707732a53e clean up after #193 Niels 2016-01-26 19:50:49 +0100
• e46cc6327f Merge pull request #193 from twelsby/issue178 Niels 2016-01-26 19:40:16 +0100
• d338042e3e added note to warn about floating-point exceptions (#181) Niels 2016-01-26 19:21:46 +0100
• 11ae1d0f09 cleanup after #196 Niels 2016-01-26 19:13:03 +0100
• 077fb1d540 Merge pull request #196 from twelsby/issue195 Niels 2016-01-26 19:12:36 +0100
• b630ce0e78 thanks Niels 2016-01-26 19:11:58 +0100
• 8deaabb289 Merge pull request #197 from m-click/fix_broken_link Niels 2016-01-26 19:10:46 +0100
• 08fd6dbf98 Fix broken link Volker Diels-Grabsch 2016-01-26 15:22:15 +0100
• 2de94365de Revert to llvm-toolchain-precise-* due to Travis white-list issue Trevor Welsby 2016-01-26 09:14:43 +1000
• a4a88b1b7d Issue #195 - update Travis to Trusty due to gcc/clang strtod() bug Trevor Welsby 2016-01-26 08:32:15 +1000
• 2b13711009 updated online version v1.1.0 Niels 2016-01-24 23:02:28 +0100
• c09d03fba7 fixed documentation Niels 2016-01-24 22:43:00 +0100
• d30ea2aa4c Update Niels 2016-01-24 22:42:16 +0100
• e664ac2bae Update Niels 2016-01-24 22:39:36 +0100
• d3b5e1451e Update Niels 2016-01-24 22:36:59 +0100
• 03e077bccf Update Niels 2016-01-24 22:34:43 +0100
• 31093694ce fixed version number Niels 2016-01-24 22:21:27 +0100
• aee99b362d some editing Niels 2016-01-24 19:24:06 +0100
• 0f28c69499 Merge upstream commits and resolve conflicts Trevor Welsby 2016-01-25 02:48:38 +1000
• 281492c581 Merge upstream commits and resolve conflicts Trevor Welsby 2016-01-25 02:42:20 +1000
• 54a4139157 cleanup after #191 Niels 2016-01-24 17:33:46 +0100
• 4620960b72 Disable problematic test for GCC/clang, remove debug dump from unit.cpp Trevor Welsby 2016-01-25 02:22:46 +1000
• ad5d1dabb2 Merge pull request #191 from twelsby/issue186 Niels 2016-01-24 17:21:22 +0100
• 81b7079255 Kill unused argument warnings in GCC/clang Trevor Welsby 2016-01-25 02:13:39 +1000
• 19918b948d Fix typo in preprocessor defined/!defined Trevor Welsby 2016-01-25 02:07:49 +1000
• 9584a99a43 added issue stats Niels 2016-01-24 17:06:36 +0100
• 421affd06e Merge upstream commits and resolve conflicts Trevor Welsby 2016-01-25 02:01:01 +1000
• 4d6985d4e2 Disable problematic test for GCC/clang, remove debug dump from unit.cpp Trevor Welsby 2016-01-25 01:53:32 +1000
• dfb01c659b added more comments Niels 2016-01-24 16:42:45 +0100
• 3245a0dc06 fixed #194 Niels 2016-01-24 16:42:13 +0100
• 12ef668335 Merge upstream commits and resolve conflicts Trevor Welsby 2016-01-25 01:15:13 +1000
• d7ef2ccffd Issue #178 - fully support int64_t/uint64_t numbers, add unsigned type Trevor Welsby 2016-01-24 23:51:42 +1000
• 8b6e0dc02d small addition Niels 2016-01-24 13:28:16 +0100
• d7d1e55648 applied include-what-you-use Niels 2016-01-24 13:28:08 +0100
• 8a0490a011 cleanup Niels 2016-01-24 13:04:55 +0100
• e00b00fea8 Merge pull request #190 from twelsby/issue185 Niels 2016-01-24 12:55:40 +0100
• 67a54a4a08 Update Niels 2016-01-24 11:12:02 +0100
• 600ad330c5 cleanup after PR #189 Niels 2016-01-24 11:00:54 +0100
• 21a44da89d Merge pull request #189 from twelsby/issue171 Niels 2016-01-24 10:47:26 +0100
• f79d52b973 DEBUG ONLY: DUMP INFO FROM TRAVIS Trevor Welsby 2016-01-24 19:15:30 +1000
• c1f5f0451d Add workaround for gcc < 5 not supporting std::defaultfloat Trevor Welsby 2016-01-24 17:54:50 +1000
• bd8db5d40e Remove VS induced tabs Trevor Welsby 2016-01-24 17:15:44 +1000
• a1c6f16bd3 Fix Issue #186 - add overload wrappers for strto(f|d|ld) Trevor Welsby 2016-01-24 17:00:11 +1000
• 3a1403409f Issue #185 - remove approx() and use #pragma to kill warnings Trevor Welsby 2016-01-23 17:45:30 +1000
• bd0f3001c6 Fix typo in new unit.hpp comments Trevor Welsby 2016-01-23 17:31:58 +1000
• 7e3245786c Fixed issue #171 - added extra operator[] template overloads Trevor Welsby 2016-01-23 17:03:45 +1000
• 9de14a4861 Fixed issue #167 - removed operator ValueType() condition for VS2015 Trevor Welsby 2016-01-23 16:34:15 +1000
• 7399393188 Update Niels 2016-01-22 19:41:27 +0100
• 1eb9e04a10 Merge 80877ad75b into f854410542 twelsby 2016-01-22 13:40:26 +0000
• 80877ad75b Add extra operator[] overload templates to address issue #171 Trevor Welsby 2016-01-22 23:20:48 +1000
• 304ccdbce1 Merge upsteam commits and remove VS induced tabs Trevor Welsby 2016-01-22 15:31:54 +1000
• 6dec1d2dc7 Merge branch 'master' of https://github.com/nlohmann/json Trevor Welsby 2016-01-22 15:15:22 +1000
• 9886b94477 Fix parse for small integers, ambiguous operater<< under VS2015 and float equality Trevor Welsby 2016-01-22 14:45:50 +1000
• 8776431855 Merge 827b15a0ba into f854410542 Erich Keane 2016-01-21 04:10:05 +0000
• 5c7eb1e011 Merge 7cd933793e into f854410542 Erich Keane 2016-01-20 20:41:12 +0000
• f854410542 added a note wrt. Valgrind (#175) Niels 2016-01-20 21:20:41 +0100
• 5c4624c351 wishlist Niels 2016-01-20 21:15:10 +0100