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

• e2f6cf7f46
  🔥 removed .test files Niels Lohmann 2017-04-14 17:35:31 +0200
• 2d2b98a50a
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-12 18:07:25 +0200
• d4469233ac
  Merge branch 'develop' into feature/insert Niels Lohmann 2017-04-12 18:01:06 +0200
• 42b4cdd4d0
  👷 Travis is very picky Niels Lohmann 2017-04-11 22:13:26 +0200
• ef55626296
  👷 added Clang 3.9-5.0 Niels Lohmann 2017-04-11 20:37:38 +0200
• 5bea6f383a
  ✏️ fixed a typo Niels Lohmann 2017-04-11 18:57:53 +0200
• 4c161161f0
  Merge branch 'feature/vs2017' into develop Niels Lohmann 2017-04-10 19:51:58 +0200
• d7e57e3b73
  🔨 added an output adapter for the binary writer Niels Lohmann 2017-04-09 22:13:26 +0200
• f3e43d7c6f
  🔨 some cleanup Niels Lohmann 2017-04-09 21:14:51 +0200
• 186a9fd44d
  🔨 simplified interface for parser, lexer, and binary_reader Niels Lohmann 2017-04-09 19:28:15 +0200
• e48114bbd6
  🔨 check for value of _HAS_CXX17 Niels Lohmann 2017-04-09 14:02:04 +0200
• 628be157a2
  🐛 added fix for #464 Niels Lohmann 2017-04-09 13:52:04 +0200
• c40c8ac92e
  👷 excluding MSVC 2015 with "/permissive- /std:c++latest /utf-8" Niels Lohmann 2017-04-09 12:00:30 +0200
• a9f4094580
  👷 another try Niels Lohmann 2017-04-09 11:47:31 +0200
• 180d249f6c
  👷 another try Niels Lohmann 2017-04-09 11:38:42 +0200
• d3d87674c8
  👷 fixed AppVeyor syntax Niels Lohmann 2017-04-09 11:00:39 +0200
• 9d9c5216d7
  👷 additional flags for MSVC #464 Niels Lohmann 2017-04-09 10:59:45 +0200
• 6f99d5b2e9
  🔨 fixed test case Niels Lohmann 2017-04-08 23:39:17 +0200
• d4e49873b7
  👷 experimenting with configurations Niels Lohmann 2017-04-08 21:56:42 +0200
• 97a25de938
  ✨ proposal for #428 Niels Lohmann 2017-04-07 18:29:09 +0200
• d62d48fc48
  🔀 merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-07 17:19:52 +0200
• 90273e930c
  🐛 fix for #512 Niels Lohmann 2017-04-07 15:44:41 +0200
• ff72f38863
  🔨 fixed another warning Niels Lohmann 2017-04-06 19:54:08 +0200
• b992acc2e7
  🔨 fixed a compiler warning Niels Lohmann 2017-04-05 20:39:27 +0200
• 08fdfcca9a
  🔨 implemented a binary writer Niels Lohmann 2017-04-04 23:17:43 +0200
• c28bf823bc
  🔨 added endianess check Niels Lohmann 2017-04-04 17:30:43 +0200
• b15fc13dd1
  🔨 implemented MessagePack in binary_reader Niels Lohmann 2017-04-04 16:59:19 +0200
• 3a34f2d82c
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-04 15:55:40 +0200
• 782570d46f
  🔨 cleanup Niels Lohmann 2017-04-03 22:58:46 +0200
• 4f6b63e492 Merge pull request #545 from theodelrieu/feature/enum_class_support Niels Lohmann 2017-04-03 22:13:59 +0200
• ea667db446
  🔨 fixed compilation errors Niels Lohmann 2017-04-03 21:53:23 +0200
• 89efe627fe
  🔨 a lot of restructuring Niels Lohmann 2017-04-02 18:46:21 +0200
• af9b21151c add enum class default conversions Théo DELRIEU 2017-04-02 13:10:15 +0200
• 3a5cf9bd0a
  🔨 improved code coverage Niels Lohmann 2017-04-01 08:34:58 +0200
• c32d2e5b3c
  🔨 removed unget() function Niels Lohmann 2017-04-01 00:36:05 +0200
• 8d393b5eff
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-31 23:58:45 +0200
• 3fa0610856
  🔨 added minibench to ignore list Niels Lohmann 2017-03-31 23:57:24 +0200
• 50ee0a62f5
  🔨 replaced lookup-tables by switches Niels Lohmann 2017-03-31 23:24:33 +0200
• 4c821c9e9c
  🔨 moved buffer size to interface Niels Lohmann 2017-03-31 17:11:51 +0200
• d07596a0ea
  📝 mentioned #540 and fixed #538 Niels Lohmann 2017-03-30 17:39:02 +0200
• 7881783745 Merge pull request #540 from tinloaf/diagnostics Niels Lohmann 2017-03-30 17:25:29 +0200
• 0b1b6307a5 Also change the re2c file Lukas Barth 2017-03-30 16:14:02 +0200
• 40aff4182f Pop for every push Lukas Barth 2017-03-30 16:10:03 +0200
• 60057a4728
  🔨 fixed bugs introduced by merging from develop Niels Lohmann 2017-03-29 07:54:26 +0200
• a690a9f2d2
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-29 00:57:09 +0200
• c2e80a72d7
  🔨 deprecated j << istream / j >> ostream functions #367 Niels Lohmann 2017-03-29 00:39:47 +0200
• 9578c0f700
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-28 23:47:17 +0200
• b4dbebffcd
  ✅ added regression test for #464 Niels Lohmann 2017-03-28 23:28:54 +0200
• 62dfdf3f5d
  📝 addressed #514 Niels Lohmann 2017-03-28 23:24:59 +0200
• 5d586b0192
  🔨 cleanup Niels Lohmann 2017-03-28 23:20:45 +0200
• 19d119e18c
  🔨 fixed a warning in MSVC Niels Lohmann 2017-03-28 22:10:24 +0200
• 6b12e40478
  🏁 removed __builtin_expect for MSVC Niels Lohmann 2017-03-28 21:55:26 +0200
• d025b6aaf7
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-28 21:39:36 +0200
• 19cd206d99
  📝 documented Xcode 8.3 Niels Lohmann 2017-03-28 21:39:16 +0200
• a0aa6ad2b2
  👷 added Xcode 8.3 Niels Lohmann 2017-03-28 20:42:12 +0200
• d37ca2eba8
  🔨 fixed test case Niels Lohmann 2017-03-28 20:29:27 +0200
• 50e251f5f6
  🔨 adjusted test case to new signature of token_type_name() Niels Lohmann 2017-03-28 20:17:00 +0200
• 6a6fbea62c
  🔨 some cleanup Niels Lohmann 2017-03-28 20:08:08 +0200
• 1e495945f1
  🔨 fixed buffer overflow Niels Lohmann 2017-03-28 18:06:43 +0200
• bbb6bd9de5
  🔨 fixing last failing test cases Niels Lohmann 2017-03-28 17:00:03 +0200
• b0c47abd88
  🔨 rewrote string parser to cope with UTF-8 Niels Lohmann 2017-03-27 22:58:44 +0200
• f75e195db3
  🔨 added code for user-defined number types Niels Lohmann 2017-03-26 18:45:04 +0200
• 3425527970
  🔨 added code for locale-independent number parsing Niels Lohmann 2017-03-26 18:12:58 +0200
• 06e2a291b1
  🔨 fixed number parsing Niels Lohmann 2017-03-26 17:26:41 +0200
• 3b069b4b4c
  🔨 adjusted more expected exceptions Niels Lohmann 2017-03-26 16:19:07 +0200
• 99e0d8b339
  🔨 fixed \uxxxx parsing Niels Lohmann 2017-03-26 15:29:08 +0200
• f47cf152a8
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-26 13:14:14 +0200
• d4d51460ab
  Merge branch 'feature/noexcept_exceptions' into develop Niels Lohmann 2017-03-26 12:54:22 +0200
• 3336194306
  🔨 reverted changes that led to Travis failures Niels Lohmann 2017-03-26 12:23:10 +0200
• 53b501a785
  🔨 cleanup Niels Lohmann 2017-03-25 23:31:03 +0100
• cf7786887c
  🔨 fixed check for is_nothrow_copy_constructible Niels Lohmann 2017-03-25 17:35:57 +0100
• c333679a96
  🔨 small refactoring Niels Lohmann 2017-03-25 17:25:39 +0100
• 747b4a6b38 Merge d3da7c8650 into a58ed3cd17 Ted Lyngmo 2017-03-25 16:23:50 +0000
• c6a26dfcc7 Merge d3da7c8650 into a58ed3cd17 Ted Lyngmo 2017-03-25 16:23:49 +0000
• cc36c65a89
  🚑 made exceptions nothrow-copy-constructible #531 Niels Lohmann 2017-03-25 16:22:52 +0100
• a58ed3cd17
  💄 cleanup Niels Lohmann 2017-03-25 14:47:23 +0100
• 20bcf1015b
  📝 cleanup after #536 Niels Lohmann 2017-03-25 14:19:05 +0100
• dc6e9b6188
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-25 14:12:58 +0100
• 0f9585685a Merge pull request #536 from vpetrigo/feature/VS17_appveyor_support Niels Lohmann 2017-03-25 14:12:30 +0100
• 8edb0cd15c Add VS17 image to appveyor matrix Vladimir Petrigo 2017-03-25 14:57:58 +0300
• 89ffcac642 Update re2c Per-Arne Andersen 2017-03-25 10:45:36 +0100
• 4966048440 Nudge GCC Version requirement to 4.8.5 Per-Arne Andersen 2017-03-25 10:42:52 +0100
• a93ec07c8c
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-24 19:53:19 +0100
• 3d597dda5d
  📝 update after #534 Niels Lohmann 2017-03-24 19:51:11 +0100
• 40160f482a
  🚧 manual lexer Niels Lohmann 2017-03-24 19:49:02 +0100
• bba688f53e Merge pull request #534 from TedLyngmo/utf8_encoding_enhancement Niels Lohmann 2017-03-24 19:38:29 +0100
• cea2426731 UTF8 encoding enhancement Ted Lyngmo 2017-03-24 14:56:48 +0100
• d3da7c8650 Remove three unnecessary bitmasks Ted Lyngmo 2017-03-24 10:56:25 +0100
• 02150914a7 Merge branch 'mini_bitmask_enhancement' of github.com:TedLyngmo/json into mini_bitmask_enhancement Ted Lyngmo 2017-03-24 10:44:20 +0100
• bdfe29c14b Remove three unnecessary bitmasks Ted Lyngmo 2017-03-23 21:37:14 +0100
• 36f936155f Remove three unnecessary bitmasks Ted Lyngmo 2017-03-23 21:37:14 +0100
• 8a872927e8 Merge pull request #530 from berkus/patch-1 Niels Lohmann 2017-03-23 13:57:54 +0100
• b14629b0a6 Fix typo Berkus Decker 2017-03-23 14:50:41 +0200
• 54db53c230
  📝 update after #527 and #525 Niels Lohmann 2017-03-22 08:10:31 +0100
• d60851168e
  🚨 fixed a compiler warning #527 Niels Lohmann 2017-03-22 08:10:02 +0100
• 67a06834b0 Merge pull request #526 from krzysztofwos/feature/exception-base-class Niels Lohmann 2017-03-22 07:50:34 +0100
• b9c3b8d688 Exit with an error if re2c is not available Krzysztof Woś 2017-03-20 13:07:01 +0900
• 86579209c8 Make exception base class visible in basic_json Krzysztof Woś 2017-03-20 12:42:44 +0900
• 31a6c0910e
  🚑 fix for #519 Niels Lohmann 2017-03-17 22:18:48 +0100
• f547679de5
  🚑 fix for #516 and #518 Niels Lohmann 2017-03-17 22:18:05 +0100