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

• 6733c16f30 Merge 7da045060b into cd53790993 Chuck Atkins 2017-08-22 14:52:32 +0000
• 7da045060b Move lambda expression outside of assert to prevent "unevaluated" error Chuck Atkins 2017-08-22 10:47:09 -0400
• cd53790993
  👷 using Clang 5.0 Niels Lohmann 2017-08-21 20:03:24 +0200
• e569b9736b
  👷 trying to fix build error Niels Lohmann 2017-08-21 17:31:14 +0200
• ba5d37ba4b
  👷 added Clang 5.0 (see https://docs.travis-ci.com/user/languages/cpp/#clang) Niels Lohmann 2017-08-21 17:27:35 +0200
• 64ef100ebf
  Revert "💥 changed iterators to andom_access_iterator #593" Niels Lohmann 2017-08-20 20:44:44 +0200
• 8acaf5bdbc
  🚨 fixing two compiler warnings Niels Lohmann 2017-08-20 19:31:07 +0200
• c77a0be5f3
  💥 changed iterators to andom_access_iterator #593 Niels Lohmann 2017-08-16 21:35:22 +0200
• aba8b58492
  🔨 approach to un-break the changes for #462 Niels Lohmann 2017-08-16 20:11:05 +0200
• 22b59693f1
  💥 CBOR/MessagePack input must end with EOF #505 Niels Lohmann 2017-08-16 14:48:23 +0200
• 1f31a5b808
  ⬆️ Catch v1.9.7 Niels Lohmann 2017-08-16 10:23:39 +0200
• f5a53de845
  👷 running sanitizer job in parallel Niels Lohmann 2017-08-16 09:21:20 +0200
• 21726d8d8f
  👷 run sanitizer after tests Niels Lohmann 2017-08-16 08:11:02 +0200
• df572aca79
  👷 set sanitizer to clang4 Niels Lohmann 2017-08-16 07:42:57 +0200
• 4391bf5615
  Merge branch 'feature/update' into develop Niels Lohmann 2017-08-16 07:39:30 +0200
• 1e360bb32b
  🔨 preparation for #505 Niels Lohmann 2017-08-16 07:39:11 +0200
• 002410410f
  Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 21:42:58 +0200
• 72afe53fa0
  📝 updated documentation for update() function #661 Niels Lohmann 2017-08-15 21:42:50 +0200
• 76123fab76
  📝 added note wrt. #667 Niels Lohmann 2017-08-15 20:49:18 +0200
• fdff42bc3d
  👷 forgot to install Cmake on OSX Niels Lohmann 2017-08-15 20:30:01 +0200
• 039e2f03bc
  Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 19:54:22 +0200
• 7f4722a75d
  Merge branch 'feature/travis_clang' into develop Niels Lohmann 2017-08-15 19:52:47 +0200
• b325b175fb Merge 2876b7deb2 into c0d511ea50 Karolis Vyčius 2017-08-14 13:50:24 +0000
• 2876b7deb2 Fix strtoull and strtoll errors Karolis Vycius 2017-08-14 16:48:11 +0300
• 3654bc4eca Change all Android unsupported functions Karolis Vycius 2017-08-14 16:11:43 +0300
• 08805f7f14
  🔨 cleanup Niels Lohmann 2017-08-13 20:57:27 +0200
• 988077e046
  Merge branch 'develop' into feature/travis_clang Niels Lohmann 2017-08-13 20:27:27 +0200
• 7d19aed567
  🔨 cleanup Niels Lohmann 2017-08-13 19:02:58 +0200
• 0f766b4580 To set install dir Matthew O'Connell 2017-08-11 14:49:05 -0400
• a0acdecac9 Merge 6eb75bda93 into 6151b056eb Matthew O'Connell 2017-08-11 14:06:03 +0000
• 6eb75bda93 To add missing cmake variable for include path Matthew O'Connell 2017-08-11 09:55:01 -0400
• 569c00eb18
  👷 changed c++17 to c++1z Niels Lohmann 2017-08-10 23:41:12 +0200
• 6151b056eb
  🔨 cleanup Niels Lohmann 2017-08-10 23:40:30 +0200
• bade3b3e6c
  👷 cleanup Niels Lohmann 2017-08-10 21:17:40 +0200
• 76b195d7d1
  👷 fix for coverity + clang-5.0 Niels Lohmann 2017-08-10 20:54:59 +0200
• cd34358e7c
  👷 removing clang from source Niels Lohmann 2017-08-10 20:37:23 +0200
• 5eb9f5fd4f
  👷 clang-3.4 Niels Lohmann 2017-08-10 20:31:59 +0200
• f49356e703
  👷 clang-3.4 Niels Lohmann 2017-08-10 20:26:49 +0200
• e0f8eb1710
  👷 clang-4.0 Niels Lohmann 2017-08-10 20:21:41 +0200
• 6dc89e47fc
  👷 clang-3.9 Niels Lohmann 2017-08-10 20:16:35 +0200
• 8de710bbe7
  👷 added source for gcc Niels Lohmann 2017-08-10 20:12:27 +0200
• 195d773bc5
  👷 added gcc Niels Lohmann 2017-08-10 20:09:39 +0200
• e7f2d2646a
  👷 removed gcc Niels Lohmann 2017-08-10 20:06:47 +0200
• 6b20f6d1ef
  👷 clang-3.8 Niels Lohmann 2017-08-10 20:04:36 +0200
• 82cd8c8d02
  👷 another try Niels Lohmann 2017-08-10 19:59:00 +0200
• f256587c4f
  👷 clang-3.4 Niels Lohmann 2017-08-10 19:56:09 +0200
• c06b5c5c10
  👷 clang-3.5 Niels Lohmann 2017-08-10 19:50:36 +0200
• 3283352db3
  👷 using clang++ Niels Lohmann 2017-08-10 19:45:33 +0200
• c20dd7522f
  👷 another try Niels Lohmann 2017-08-10 19:40:09 +0200
• 94dfecd487
  👷 removed g++ Niels Lohmann 2017-08-10 19:31:43 +0200
• 8963aae57d
  👷 clang-3.6 Niels Lohmann 2017-08-10 19:24:36 +0200
• 5aceb0e029
  👷 clang-3.6 Niels Lohmann 2017-08-10 19:23:55 +0200
• e7a7e4f81f
  👷 fixed compiler Niels Lohmann 2017-08-10 19:18:45 +0200
• e333562633
  👷 different source Niels Lohmann 2017-08-10 19:15:16 +0200
• eb6de822bb
  👷 clang-3.7 Niels Lohmann 2017-08-10 19:12:04 +0200
• c1642affaa
  👷 clang-3.8 Niels Lohmann 2017-08-10 19:03:35 +0200
• a46afd4008 Merge pull request #679 from traits/patch-1 Niels Lohmann 2017-08-10 11:39:13 +0200
• 54c67dcfec Update json.hpp traits 2017-08-10 09:05:00 +0200
• 99ea12f304
  📝 acknowledgements for #674, #678, #682, #685, and #686 Niels Lohmann 2017-08-10 06:50:34 +0200
• d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 Niels Lohmann 2017-08-10 06:44:59 +0200
• afe05970e6 Merge cb8716ef43 into 345846b514 David Hirvonen 2017-08-09 18:38:16 +0000
• cb8716ef43 patch android + gcc locale issue David Hirvonen 2017-08-09 14:37:21 -0400
• 345846b514 Merge pull request #685 from daixtrose/patch-1 Niels Lohmann 2017-08-09 15:32:33 +0200
• c9509ccf97 Update json.hpp WebProdPP 2017-08-09 16:13:43 +0300
• 86b3d06a93 remove duplicate word Markus Werle 2017-08-09 11:56:48 +0200
• 6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx Niels Lohmann 2017-08-09 10:16:03 +0200
• 4b55f0ebd6 To fix compilation issue for intel OSX compiler Kyle Thompson 2017-08-08 18:43:03 -0400
• c90bf5e0f1
  👷 removed failing builders Niels Lohmann 2017-08-08 21:26:15 +0200
• dd008545d1
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-08-08 19:15:49 +0200
• 054b0250be
  👷 trying to install g++ to make clang work Niels Lohmann 2017-08-08 19:14:22 +0200
• ab44a50d98 Digraph warning traits 2017-08-07 14:23:48 +0200
• b32a6b8c75 Merge pull request #678 from DmitryKuk/develop Niels Lohmann 2017-08-05 13:42:43 +0200
• 19437c15de massage -> message DmitryKuk 2017-08-05 10:43:08 +0300
• e523312fa2
  ✅ improved test coverage Niels Lohmann 2017-08-03 17:47:42 +0200
• d2c3592908
  ✅ added test cases for update #661 Niels Lohmann 2017-08-02 22:44:58 +0200
• d1e13d5128
  🎉 first draft for #661 Niels Lohmann 2017-08-02 22:12:41 +0200
• 0ea0d7d860 Merge pull request #674 from wincent/patch-1 Niels Lohmann 2017-08-01 20:21:04 +0200
• efdfd3aa5b
  ⚡ replaced by-value call #673 Niels Lohmann 2017-08-01 19:37:25 +0200
• 391303521a Fix "not constraint" grammar in docs Greg Hurrell 2017-08-01 08:56:28 -0700
• 76ecb2bd60 Merge pull request #671 from dan-42/develop Niels Lohmann 2017-08-01 07:15:55 +0200
• db0b9732d4 DOC: add sort mentioning about support in hunter dan-42 2017-07-31 23:20:37 +0200
• e60002a1b3
  🔨 fixed GCC warnings in #663 Niels Lohmann 2017-07-31 23:17:14 +0200
• 966989a3f5 CONFIG: pin cmake to enable only C++ dan-42 2017-07-31 09:49:26 +0200
• 850d856aae
  🔨 cleanup after #663 Niels Lohmann 2017-07-30 20:30:05 +0200
• 3d67ec40a6
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-07-30 20:01:35 +0200
• 85c768084b
  🔨 using emplace Niels Lohmann 2017-07-30 20:01:31 +0200
• 67fb517ccd Merge pull request #669 from dan-42/change_installed_cmake_include_path Niels Lohmann 2017-07-30 20:01:03 +0200
• 80e95844f6 Merge pull request #663 from himikof/move-construction Niels Lohmann 2017-07-30 20:00:46 +0200
• aad55219f8 Merge branch 'develop' into move-construction Niels Lohmann 2017-07-30 19:49:24 +0200
• 96dd4ffa19
  🔨 simplified a call Niels Lohmann 2017-07-30 18:30:34 +0200
• 7737a29518
  🔨 small parser performance improvements Niels Lohmann 2017-07-30 13:25:36 +0200
• f434942371 REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse dan-42 2017-07-29 11:59:09 +0200
• c819a2d732
  🔨 refactored some scanner internals Niels Lohmann 2017-07-28 19:18:50 +0200
• 5851daa576
  ✨ binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 Niels Lohmann 2017-07-28 00:21:55 +0200
• c136b6f200 Merge pull request #666 from effolkronium/develop Niels Lohmann 2017-07-27 20:48:56 +0200
• 7d51214045
  ✨ implemented exception-free parser #458 #582 Niels Lohmann 2017-07-27 20:33:11 +0200
• a27dd3a6f6 enable_testing only if JSON_BuildTests is ON Ilya Polishchuk 2017-07-27 17:50:24 +0300
• 669ebf51bc
  🔨 fixed an error in MSVC Niels Lohmann 2017-07-27 06:04:35 +0200
• 3d589fd032
  🔨 fixed compilation error Niels Lohmann 2017-07-26 23:59:56 +0200
• e6aa700360
  🔨 cleanup Niels Lohmann 2017-07-26 23:44:55 +0200