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

• 20d75a26a5 more descriptive documentation in example Trevor Hickey 2015-01-25 21:00:28 -0500
• b453cdb7a2 more examples Niels 2015-01-24 21:11:42 +0100
• 85aa0a328e updated README Niels 2015-01-24 21:06:05 +0100
• 5199382c91 worked on issue #8 and #27 Niels 2015-01-24 20:33:06 +0100
• 47e3a3ed24 another test case Niels 2015-01-23 20:46:46 +0100
• f8d263a811 another test case Niels 2015-01-23 18:42:24 +0100
• 807de40463 implemented missing operator[] Niels 2015-01-23 18:27:58 +0100
• 36f14d21da more test cases for reverse iterators Niels 2015-01-23 18:07:31 +0100
• c22ee3f296 fixed an issue with non portability Niels 2015-01-21 18:04:12 +0100
• 6ee46ed519 cleanup Niels 2015-01-21 17:42:45 +0100
• d66743b9c2 fixed a memory leak Niels 2015-01-21 15:59:52 +0100
• bbc45eb4d8 overworked iterators Niels 2015-01-21 15:43:24 +0100
• 76be1ae1f6 + more adjustments toward a real container Niels 2015-01-21 11:47:03 +0100
• 3c780f0f57 + generic constructors for arrays and objects Niels 2015-01-21 09:40:46 +0100
• 7afabc2b7e another test case Niels 2015-01-20 22:06:45 +0100
• ee45bca4a9 + more test cases Niels 2015-01-20 21:49:21 +0100
• 75ba6ae4ff + improved test case coverage Niels 2015-01-20 21:35:08 +0100
• a7a946bd18 added missing header Niels 2015-01-20 21:15:14 +0100
• 54fc97d434 + set number type to int64_t Niels 2015-01-20 20:43:54 +0100
• a144800774 + implemented member and non-member swap Niels 2015-01-19 19:51:07 +0100
• c8fa82f411 Merge f9889a9ff2 into 7724d34741 Kirk Shoop 2015-01-18 10:51:05 +0000
• 7724d34741 fixed #31: only use spaces in pretty print Niels 2015-01-18 10:58:48 +0100
• f9889a9ff2 fix whitespace and add .editorconfig Kirk Shoop 2015-01-17 17:57:04 -0800
• 795f516cea support visual studio compilers (2013 & 2014) on windows Kirk Shoop 2015-01-16 18:42:18 -0800
• b30e9ee5f4 test cases to cover 100% of the fix of #28 Niels 2015-01-13 19:26:42 +0100
• 19043d2003 this should fix #28 Niels 2015-01-13 19:07:53 +0100
• d47b0e749b updated README Niels 2015-01-12 23:38:55 +0100
• dcf71748a6 Merge pull request #26 from wancw/fix_clang_string_casting Niels 2015-01-12 22:54:39 +0100
• 36f6199898 Fix string conversion under Clang WanCW 2015-01-12 20:03:41 +0800
• bd05c7a18a small tidy up after pull request #22 Niels 2015-01-11 15:16:14 +0100
• 6533b33387 Merge pull request #22 from Teemperor/unicode_escaping Niels 2015-01-11 15:08:13 +0100
• 8d9c2bea4e + applied style guide Niels 2015-01-11 15:05:04 +0100
• 80b5db16b5 Merge pull request #24 from Teemperor/fix_string_dumping Niels 2015-01-11 14:03:53 +0100
• cc7e942870 Merge pull request #23 from Teemperor/gcc_remark_readme Niels 2015-01-11 12:47:00 +0100
• 7b97ec884e Fixed dumping of strings Raphael Isemann 2015-01-10 22:04:57 +0100
• a866a9d980 Reapplied code style fixes Raphael Isemann 2015-01-10 19:53:13 +0100
• a409ba9488 Fixed build Raphael Isemann 2015-01-10 18:46:01 +0100
• 0fcc414995 More testing and updated CMake to allow calling private functions from the tests Raphael Isemann 2015-01-10 18:28:53 +0100
• 85888e8205 Added a remark to the readme that coverage is GCC only for now Raphael Isemann 2015-01-10 18:09:46 +0100
• 6105ce5484 Allowed automerge Raphael Isemann 2015-01-10 17:33:18 +0100
• 1287f03084 Code point are two words, and so the "P" should be capital Raphael Isemann 2015-01-10 16:50:39 +0100
• 5a54e46709 Fully implemented the JSON spec Raphael Isemann 2015-01-10 16:49:10 +0100
• 222aacc213 Quick and dirty implementation for basic multilingual plane in the unicode escape mechanism Raphael Isemann 2015-01-10 10:36:30 +0100
• 0cd2ecf48f minor style adjustments Niels 2015-01-09 20:48:16 +0100
• 3fa2e900ef + added Thanks section to README Niels 2015-01-09 20:48:06 +0100
• 69195e070f Merge pull request #21 from Teemperor/fixed_escaped_chars Niels 2015-01-09 20:32:08 +0100
• 13efc7a02a More tests to get line coverage backt o 100% Raphael Isemann 2015-01-09 20:24:58 +0100
• 7f4fcc51f6 Implemented the JSON spec for string parsing for everything but the \uXXXX escaping for unicode Raphael Isemann 2015-01-09 20:03:18 +0100
• 52f399d55f created a header-only version (see issue #16) Niels 2015-01-09 18:16:27 +0100
• 2443aa6521 updated README Niels 2015-01-09 17:50:50 +0100
• 33f5236687 added missing header Niels 2015-01-09 17:40:14 +0100
• 535aef5ad0 Merge pull request #19 from kirkshoop/stditerator Niels 2015-01-09 17:37:42 +0100
• 33f5e74905 minor syntax adjustments Niels 2015-01-09 16:38:34 +0100
• 3486a5d9bb add the std iterator typedefs to iterator and const_iterator Kirk Shoop 2015-01-09 07:33:28 -0800
• 661a44d156 Merge pull request #18 from Teemperor/fix_quote_escaping Niels 2015-01-09 16:32:39 +0100
• 4a39bfb17e Fixed typo in comments Raphael Isemann 2015-01-09 11:57:39 +0100
• fa0ee9c927 Fixed escaped quotes Raphael Isemann 2015-01-08 22:35:48 +0100
• 4647401030 fixed #15 Niels 2015-01-06 22:05:32 +0100
• bd9f49efb9 implemented pretty printing (issue #13) Niels 2015-01-06 21:44:07 +0100
• 08456b8ff0 minor changes Niels 2015-01-06 19:14:03 +0100
• d84f8ebb02 valgrind parameter is not understood in travis Niels 2015-01-06 18:57:44 +0100
• 43a85be471 travis now checks with valgrind Niels 2015-01-06 18:52:14 +0100
• 5f05d02c6a Merge pull request #14 from elliotgoodrich/master Niels 2015-01-06 18:43:21 +0100
• a53c878c81 moved class into "nlohmann" namespace Niels 2015-01-06 18:41:24 +0100
• 0773f40a8e Fix double delete on std::bad_alloc exception Elliot Goodrich 2015-01-06 09:12:55 +0000
• 4f0afbbe64 added note from http://isocpp.org/blog/2015/01/json-for-modern-cpp Niels 2015-01-05 22:25:44 +0100
• f0582a8b60 ignore some CMake files Niels 2015-01-05 20:36:31 +0100
• bf768d96d9 minor Markdown error Niels 2015-01-05 20:30:34 +0100
• b39f78924a Merge pull request #6 from Teemperor/master Niels 2015-01-05 20:28:56 +0100
• 67459fcd83 Added CMake to the README Raphael Isemann 2015-01-05 11:29:41 +0100
• bd4e0e4fee Merge branch 'master' of github.com:nlohmann/json Raphael Isemann 2015-01-05 11:20:32 +0100
• 0f371b4086 CMake and coverage report Raphael Isemann 2015-01-05 11:19:42 +0100
• a9669a410d removed "noexpect" from all functions that use new Niels 2015-01-04 23:18:24 +0100
• 540cda6118 used _-suffix for member variables Niels 2015-01-04 23:09:30 +0100
• 3bef1a5097 renamed "toString()" to "to_string()" Niels 2015-01-04 20:50:28 +0100
• f63ff7727e renamed class from "JSON" to "son" Niels 2015-01-04 20:43:25 +0100
• 4d00105e5c tidy up Niels 2015-01-04 19:05:46 +0100
• 0019c85b85 fix Niels 2015-01-04 18:55:15 +0100
• aa166a4739 updated examples Niels 2015-01-04 18:52:04 +0100
• 77ea63ceb5 fixed a link Niels 2015-01-04 18:32:03 +0100
• 4ea98517f5 updated README Niels 2015-01-04 13:20:32 +0100
• bd0be5f0af fixed memory leak Niels 2015-01-04 12:29:16 +0100
• 481f377cfe + guard call to std::ios_base::sync_with_stdio Niels 2015-01-04 12:05:28 +0100
• 9537c70b67 removing flawed test case Niels 2015-01-03 17:51:14 +0100
• 764ed26c41 cleanup Niels 2015-01-03 17:18:17 +0100
• 18364aac85 parser returns an object Niels 2015-01-02 17:19:40 +0100
• 16c30cff8b removed old C fragments Niels 2015-01-02 15:29:36 +0100
• af4aca9edd + better string handling Niels 2015-01-02 12:47:32 +0100
• 85abe926cf fixed coveralls call to ignore benchmarks folder Niels 2014-12-30 12:02:38 +0100
• 6995d33fb1 + fixed documentation bugs Niels 2014-12-30 11:57:58 +0100
• 2335d3f3d5 tidy up Niels 2014-12-30 11:47:28 +0100
• 39cf26e2db minor changes Niels 2014-12-30 11:29:59 +0100
• 2be4f24837 + updated reference Niels 2014-12-30 11:19:35 +0100
• 9e61092fc6 + overworked parser Niels 2014-12-30 10:54:01 +0100
• 4e44390090 + fixed a bug in the stream input Niels 2014-12-29 21:13:03 +0100
• 15a9d3cff6 minor changes Niels 2014-12-29 19:54:31 +0100
• 0b8dda1e0c minor changes Niels 2014-12-29 18:32:17 +0100
• f50fdd08a7 syntax highlighting Niels 2014-12-29 18:20:55 +0100
• 6687ea1a36 updated reference Niels 2014-12-29 18:19:06 +0100
• cff4d40afd type reference Niels 2014-12-29 17:07:00 +0100