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

• a04bd4f851 cleanup after #184 Niels 2016-01-20 21:14:58 +0100
• 663ad13fc3 Merge pull request #184 from dariomt/master Niels 2016-01-20 20:58:44 +0100
• db3c7fdb96 added missing template keyword (required by clang) dariomt 2016-01-19 16:20:27 +0100
• e2f0e8b945 added missing typename (required by clang/gcc) dariomt 2016-01-19 14:56:07 +0100
• 4d079d135e replicate code changes into re2c file dariomt 2016-01-18 11:32:24 +0100
• 09a4751ee7 Enhance get_number() parsing (also eliminate Valgrind induced errors) Trevor Welsby 2016-01-18 19:10:51 +1000
• e1645a09e9 Merge branch 'master' of https://github.com/nlohmann/json dariomt 2016-01-18 10:08:58 +0100
• b40408a755 Fully support int64_t/uint64_t numbers, add unsigned type Trevor Welsby 2016-01-17 20:26:40 +1000
• 4ce2b93324 Fully support int64_t/uint64_t numbers, add unsigned type Trevor Welsby 2016-01-17 19:30:04 +1000
• a96e155a71 Fully support int64_t/uint64_t numbers, add unsigned type Trevor Welsby 2016-01-17 19:24:54 +1000
• 72e33eec1a thanks Niels 2016-01-15 08:24:44 +0100
• 8968885c61 Merge pull request #182 from nibroc/master Niels 2016-01-15 07:21:07 +0100
• 8ecccf8628 Fixed some typos in CONTRIBUTING.md Corbin Hughes 2016-01-14 22:35:48 -0600
• c0bb5a56eb added note on assertions (#168) Niels 2016-01-13 21:08:42 +0100
• a05f27867b fixed wrong file name Niels 2016-01-13 20:37:05 +0100
• ee930f3875 Update Niels 2016-01-13 20:33:01 +0100
• 832fe49bc1 fixed lists Niels 2016-01-13 20:26:47 +0100
• 57e018483a it's 2016 already... Niels 2016-01-13 20:19:05 +0100
• 1741e58eb5 contribution guidelines (#175) Niels 2016-01-13 20:18:06 +0100
• 4511145d3d removing unused catch variables (fixes #180) Niels 2016-01-13 19:19:35 +0100
• 4eb3e41f64 Update Niels 2016-01-13 19:16:43 +0100
• 151d43f63e fixing numerous typos (fixes #179) Niels 2016-01-13 19:14:33 +0100
• b2d68ffd8f Implement empty base optimization for allocator-aware basic_json Pierre-Antoine Lacaze 2016-01-03 19:13:14 +0100
• 4a452f11f9 added assertions (#168) Niels 2016-01-03 17:05:27 +0100
• fda4d2de1e Merge cc24003700 into d27c8a8ea8 Pierre-Antoine Lacaze 2016-01-03 00:27:55 +0000
• cc24003700 Make basic_json allocate-aware, as mentioned in #161 Pierre-Antoine Lacaze 2016-01-03 01:24:23 +0100
• 7cd933793e Changes to re2c file to match the json.hpp changes Erich Keane 2016-01-02 08:50:31 -0800
• d27c8a8ea8 reverting OSX Niels 2016-01-02 16:49:56 +0100
• fb7ff414ad more Valgrind information Niels 2016-01-02 16:42:45 +0100
• 2d48a36f5c trying Travis and OSX Niels 2016-01-02 16:37:40 +0100
• b4bb3afb65 removed clang 3.8 Niels 2016-01-02 15:42:56 +0100
• 4a87ed4441 trying Clang 3.8 Niels 2016-01-02 15:34:34 +0100
• 33abe87407 forgot version number Niels 2016-01-02 15:30:12 +0100
• dbf58ae9c0 trying to add Clang 3.7 toolchain Niels 2016-01-02 15:24:13 +0100
• 7614aa31c0 cleanup Niels 2016-01-02 13:07:22 +0100
• 03ccb5917e Abstract object/array type out so that arbitrary types can be used Erich Keane 2016-01-01 13:35:21 -0800
• 9b07504e23 fix for #166 Niels 2016-01-01 18:33:58 +0100
• 827b15a0ba Convert the non-unordered_map case not use key_compare Erich Keane 2015-12-30 13:22:45 -0800
• 16e8d99967 Remove need for object_t to be fully instanced, allowing unordered_map Erich Keane 2015-12-30 11:33:56 -0800
• 90ab92ade1 Attempt at adding unordered_map as a basic_json object type Erich Keane 2015-12-30 11:12:58 -0800
• 3905406f9c removed an unnecessary cast (fixed #162) Niels 2015-12-29 12:30:05 +0100
• 0f15aba494 Update Niels 2015-12-28 15:08:15 +0100
• aca6a3b373 version number Niels 2015-12-28 15:04:15 +0100
• b2e984e0b4 Update Niels 2015-12-28 15:03:01 +0100
• cb5581392a preparing 1.0.0 release Niels 2015-12-28 14:51:57 +0100
• 80cdecaadd fixed a cppcheck warning v1.0.0 Niels 2015-12-27 18:07:21 +0100
• d80bbffc78 minor cleanup Niels 2015-12-27 17:58:36 +0100
• ace055f63b Update Niels 2015-12-27 15:34:08 +0100
• 7371c71d2a using CHECK_THROWS_WITH to check exceptions (#160) Niels 2015-12-27 15:30:30 +0100
• d6b8830e03 more work on exceptions (#160) Niels 2015-12-26 13:17:32 +0100
• dc8ab92552 more tests for exceptions (#160) Niels 2015-12-25 13:04:40 +0100
• 76e5e29eda overworked exceptions and tests (#160) Niels 2015-12-25 11:46:18 +0100
• 8620583cf9 cleanup Niels 2015-12-23 12:05:57 +0100
• a9b56418bc Update Niels 2015-12-23 08:48:23 +0100
• fcbd984e0f cleanup Niels 2015-12-23 08:44:34 +0100
• 752082e545 Update Niels 2015-12-23 08:25:25 +0100
• 70493a10d1 iterator_wrapper for const objects (#83) Niels 2015-12-23 08:21:29 +0100
• 00f9296db5 some cleanup for #83 Niels 2015-12-22 18:07:51 +0100
• 2c677528e6 Update Niels 2015-12-22 13:29:42 +0100
• 67c2d90a21 working on #160 Niels 2015-12-22 13:27:40 +0100
• c0b55a0162 Update Niels 2015-12-21 08:52:53 +0100
• 4351698c83 re-adding const version operator[] (#135, #159) Niels 2015-12-21 08:42:42 +0100
• 149fbba5aa Update Niels 2015-12-20 15:50:04 +0100
• 9def0186be upgraded Catch to v1.3.1 Niels 2015-12-20 15:42:01 +0100
• 457bfc2401 work on #144 Niels 2015-12-20 15:30:07 +0100
• 1adb9d62dd fixed #156 Niels 2015-12-17 16:52:38 +0100
• 2e3c9774e5 Update Niels 2015-12-17 16:26:44 +0100
• ac4d4a0f66 fixed compilation error and fixed shadow warnings Niels 2015-12-17 16:22:15 +0100
• df1bafd8f5 Update Niels 2015-12-17 15:55:39 +0100
• 07033f67a5 some cleanup and more documentation Niels 2015-12-17 15:49:33 +0100
• 7f399f8e92 Update Niels 2015-12-16 12:12:56 +0100
• fb972e845b show reference to source code in documentation Niels 2015-12-16 12:10:12 +0100
• 6ac89df54d fix for #127 Niels 2015-12-16 12:09:59 +0100
• 0c2ea62328 Update Niels 2015-12-15 19:44:57 +0100
• a615598b14 cleanup documentation; started added versions Niels 2015-12-15 19:42:32 +0100
• 1b13924b99 Merge 663ea4e70c into 1df5d726d9 Kayne Ruse 2015-12-15 17:34:57 +0000
• 1df5d726d9 undid the fix for #136 Niels 2015-12-15 18:34:07 +0100
• 663ea4e70c Potential workaround for #136 Louise Ruse 2015-12-15 19:33:35 +1100
• 5c0fc419bd Update Niels 2015-12-15 08:42:49 +0100
• cd04a7d3e9 fix for #133 Niels 2015-12-15 08:38:54 +0100
• 2ba901bbf6 cleanup Niels 2015-12-14 21:23:21 +0100
• 5bc1b65676 clean up (for #154) Niels 2015-12-14 16:58:49 +0100
• 258f04c561 fixed #154 (no more warnings for incomplete switches) Niels 2015-12-14 16:32:37 +0100
• f5ccdba55d Update Niels 2015-12-13 11:29:21 +0100
• a70a7a8001 fixed #135: operator[] now only works on nonconst JSON objects Niels 2015-12-13 11:26:55 +0100
• c767f464bb dropped GCC 4.8 support (due to #110) Niels 2015-12-08 18:12:34 +0100
• 9da8770f3a ignore UTF-8 byte order mark (fixes #152) Niels 2015-12-07 22:27:53 +0100
• e0d334c4f1 added a comment (see #109) Niels 2015-12-07 21:53:32 +0100
• d6771ac79d corrected a username Niels 2015-12-07 21:50:27 +0100
• d9432aa168 Merge pull request #124 from emvivre/master Niels 2015-12-07 21:11:58 +0100
• 22bc022745 added change from #140 Niels 2015-12-07 21:05:21 +0100
• 72476b4226 cleanup after #153 Niels 2015-12-07 20:38:13 +0100
• f36f316fc7 Merge pull request #153 from whackashoe/remove_sprintf Niels 2015-12-07 20:35:43 +0100
• aa7edbba45 Merge 6ac67bc634 into 6f8e36ac3d 406345 2015-12-07 02:12:56 +0000
• e04f76742a Merge c8021ce397 into 6f8e36ac3d Ben Long 2015-12-07 00:52:05 +0000
• 6f8e36ac3d fixes #136 Niels 2015-12-06 17:33:47 +0100
• 14d8a91f73 Replace sprintf with hex function, this fixes #149 Jett 2015-11-19 00:17:36 -0600
• b26db497f3 Merge f9f0c3641d into c013223276 Damien Buhl 2015-11-16 09:28:40 +0000
• c013223276 Merge pull request #146 from robertmrk/surrogate-pair-parsing-fix Niels 2015-11-14 08:22:04 +0100
• ec7a1d8347 Fix character skipping after a surrogate pair Robert Marki 2015-11-13 12:49:26 +0100