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

• f0bc16d899
  🔨 overworked coverage targets Niels Lohmann 2019-04-06 09:02:17 +0200
• b4b06d89b5
  ⬆️ updated fastcov Niels Lohmann 2019-04-06 00:24:19 +0200
• e65cff2a8f
  🔨 small cleanup Niels Lohmann 2019-04-05 23:31:04 +0200
• 63fe1cbbcf
  📝 updated README Niels Lohmann 2019-04-05 18:29:57 +0200
• 0bdadb12c7
  Merge branch 'feature/circleci' into develop Niels Lohmann 2019-04-05 17:50:48 +0200
• 0a1ddd6882
  ⬆️ updated fastcov Niels Lohmann 2019-04-05 07:54:46 +0200
• 4676f759e8
  ⬆️ updated fastcov Niels Lohmann 2019-04-04 09:50:27 +0200
• da279234d5
  Merge branch 'develop' into feature/fastcov Niels Lohmann 2019-04-04 09:03:11 +0200
• f05614b240
  🏗️ adding anonymous namespace Niels Lohmann 2019-04-04 08:56:36 +0200
• 0da99027b7
  🚨 silenced a warning Niels Lohmann 2019-04-03 17:44:09 +0200
• 1f03395e2c
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-04-03 17:28:50 +0200
• 2f9095ddab
  🔨 relaxed requirements to coverage Niels Lohmann 2019-04-03 17:28:47 +0200
• ee8732c359
  Merge pull request #1555 from theodelrieu/fix/1511 Niels Lohmann 2019-04-03 17:24:25 +0200
• d1ef75316e
  Merge pull request #1439 from onqtam/doctest Niels Lohmann 2019-04-03 17:01:48 +0200
• d66abda4ee
  tests: fix coverage Théo DELRIEU 2019-04-03 12:34:15 +0200
• e6e6805c6c
  add built-in array support in get_to Théo DELRIEU 2019-04-01 13:32:06 +0200
• 2806b201a8
  make sure values are overwritten in from_json overloads Théo DELRIEU 2019-04-01 13:09:38 +0200
• f9bc348d1b Allow implicit conversion basic_json -> string_view Thomas Schaub 2019-03-25 23:36:35 +0100
• 821517f95d Install g++-7 with clang-7 Thomas Schaub 2019-03-20 22:29:14 +0100
• fdfdb70f75 Introduce JSON_HAS_STRING_VIEW Thomas Schaub 2019-03-17 09:46:12 +0100
• ec06013eb0 Fix setting the C++ standard for Travis builds Thomas Schaub 2019-03-14 17:30:42 +0100
• da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings onqtam 2019-03-31 13:57:44 +0300
• 64873fb5b8
  Merge branch 'develop' into doctest Viktor Kirilov 2019-03-30 23:23:33 +0200
• 80daa19331
  👷 Ninja seems not to work Niels Lohmann 2019-03-30 17:39:50 +0100
• 0a57c51a69
  👷 adding concurrency Niels Lohmann 2019-03-30 17:32:52 +0100
• a5e00f2cf7
  👷 fixed path Niels Lohmann 2019-03-30 17:19:27 +0100
• 5ebe722045
  👷 full workflow Niels Lohmann 2019-03-30 17:14:50 +0100
• ecf4d5e91d
  👷 trying CircleCI Niels Lohmann 2019-03-30 17:05:43 +0100
• 53001414c7
  🔨 using --exclude-gcov to exclude files Niels Lohmann 2019-03-30 17:00:30 +0100
• b12287b362
  ⚗️ trying fastcov Niels Lohmann 2019-03-30 09:12:32 +0100
• b21c04c938
  🔥 removed unsupported flag Niels Lohmann 2019-03-29 17:34:58 +0100
• c7878173f9
  🔨 minor changes to maintainer targets Niels Lohmann 2019-03-29 13:10:11 +0100
• b52c3638f5
  Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang Niels Lohmann 2019-03-29 09:14:25 +0100
• d21d298397
  🎨 fixed indentation Niels Lohmann 2019-03-28 14:23:26 +0100
• 23635704c3
  ⬆️ added script to update cpplint Niels Lohmann 2019-03-28 14:23:07 +0100
• 191aa0fd6f
  🔧 overworked maintaner targets Niels Lohmann 2019-03-28 14:22:48 +0100
• 5ccdaf643f Remove C++17 extension warning from clang; #1535 Watal M. Iwasaki 2019-03-28 14:38:58 +0900
• b4def6dcba tabs instead of spaces... onqtam 2019-03-27 01:13:10 +0200
• a0000c3235 finished the last of the warnings onqtam 2019-03-27 01:09:47 +0200
• 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo onqtam 2019-03-27 00:58:53 +0200
• 82af0ecdc1
  Merge branch 'develop' into doctest Viktor Kirilov 2019-03-26 23:32:32 +0200
• d79c16801a
  Merge branch 'feature/doozer' into develop Niels Lohmann 2019-03-26 10:49:56 +0100
• 24d91cf36f
  📝 added Doozer to README Niels Lohmann 2019-03-26 10:49:14 +0100
• 0991824584
  👷 version output Niels Lohmann 2019-03-26 10:41:05 +0100
• 0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support onqtam 2019-03-25 22:04:37 +0200
• 9d2f0391e0
  👷 fixed timeout Niels Lohmann 2019-03-25 12:30:45 +0100
• af9da22b87
  👷 adding xenial-armhf Niels Lohmann 2019-03-25 07:15:03 +0100
• 0a67b51fce
  👷 forgot path to ctest Niels Lohmann 2019-03-25 07:03:41 +0100
• e27b282033
  👷 skip certificate check Niels Lohmann 2019-03-25 06:45:35 +0100
• cde0b24389
  👷 fixed required packages Niels Lohmann 2019-03-25 06:43:14 +0100
• f091fe31bc
  👷 increased timeout Niels Lohmann 2019-03-25 06:39:41 +0100
• 28dfbedda7
  👷 fixed timeout Niels Lohmann 2019-03-24 18:14:59 +0100
• ff51a32be1 updated doctest to version 2.3.1 released today onqtam 2019-03-24 17:28:52 +0200
• 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest onqtam 2019-03-24 17:21:44 +0200
• dcbc028b5b
  👷 fixed syntax Niels Lohmann 2019-03-24 09:02:46 +0100
• 842d42b135
  👷 unified paths Niels Lohmann 2019-03-24 09:02:06 +0100
• 1e86976cfe
  👷 fixed paths Niels Lohmann 2019-03-24 08:53:30 +0100
• 30211477b7
  👷 fixed package name Niels Lohmann 2019-03-24 08:36:01 +0100
• 5e1cae0a7d
  👷 install g++ Niels Lohmann 2019-03-24 08:24:50 +0100
• c871c9a01c
  👷 install correct g++ Niels Lohmann 2019-03-24 06:51:10 +0100
• 63d619e21f
  👷 need to install g++ Niels Lohmann 2019-03-24 00:48:59 +0100
• c94b764a6e
  👷 fixed installation Niels Lohmann 2019-03-24 00:43:01 +0100
• 65cdccfa8a
  👷 fixed syntax error Niels Lohmann 2019-03-24 00:36:46 +0100
• a72ac18514
  👷 use recent cmake Niels Lohmann 2019-03-24 00:36:05 +0100
• 4327ae0bef
  👷 need more recent cmake for CentOS Niels Lohmann 2019-03-24 00:15:57 +0100
• fabf953305
  👷 fixed a typo Niels Lohmann 2019-03-24 00:12:36 +0100
• 6e3e2ee2e4
  👷 fixed buildenv values Niels Lohmann 2019-03-24 00:11:20 +0100
• bc5089e803
  👷 add test output to avoid timeout Niels Lohmann 2019-03-24 00:02:41 +0100
• 7dd3e6384b
  👷 added Fedora and CentOS Niels Lohmann 2019-03-23 23:42:29 +0100
• 490c6e926e
  👷 using raspbian Niels Lohmann 2019-03-23 23:27:39 +0100
• 2fcca259b0
  👷 added cmake Niels Lohmann 2019-03-23 23:21:17 +0100
• 72dd6f349e
  👷 trying doozer Niels Lohmann 2019-03-23 23:18:27 +0100
• baaa2a4d0f
  🏁 trying to use constructors from std::allocator #1536 Niels Lohmann 2019-03-21 14:09:29 +0100
• 1126c9ca74
  Merge branch 'release/3.6.1' into develop v3.6.1 Niels Lohmann 2019-03-20 21:03:43 +0100
• 295732a817
  Merge branch 'release/3.6.1' 3.6.1 Niels Lohmann 2019-03-20 21:03:30 +0100
• efa1b9a7bb
  🔖 set version to 3.6.1 Niels Lohmann 2019-03-20 20:50:05 +0100
• b33093d610
  🐛 fixed regression #1530 Niels Lohmann 2019-03-20 14:40:23 +0100
• 9d6ab9014f
  🏁 fixed a compilation error in MSVC #1531 Niels Lohmann 2019-03-20 14:13:29 +0100
• c790b9f8c0
  🐛 fixed regression #1530 Niels Lohmann 2019-03-20 12:41:08 +0100
• 483a086562
  ⚗️ added funding link Niels Lohmann 2019-03-20 11:42:24 +0100
• d2a08ddafd
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-20 11:06:55 +0100
• 7c55510f76
  🚨 fixed some warnings #1527 Niels Lohmann 2019-03-20 11:06:39 +0100
• a4ce2710fc Replace "const_reference" with "const basic_json&" and "reference" with "basic_json&" ariel ariel 2019-03-12 19:42:01 +0200
• 3ac5fa31c5
  💬 update issue templates Niels Lohmann 2019-03-20 01:27:37 +0100
• 51e1564c9e
  Merge branch 'release/3.6.0' into develop v3.6.0 Niels Lohmann 2019-03-20 00:38:29 +0100
• 944267f522
  Merge branch 'release/3.6.0' Niels Lohmann 2019-03-20 00:38:16 +0100
• 0abf0f80c9
  🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:22:12 +0100
• b37392b7ac
  🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:19:07 +0100
• 002addabd8
  🚨 fixed a warning Niels Lohmann 2019-03-19 23:10:21 +0100
• a6f9b4e36d
  👥 added contributors Niels Lohmann 2019-03-19 17:18:33 +0100
• 18cc7ddd62
  📝 completed documentation index page Niels Lohmann 2019-03-19 16:03:02 +0100
• e07e8e7912
  📝 updated documentation Niels Lohmann 2019-03-19 15:40:23 +0100
• 710f26f95c
  📝 added documentation Niels Lohmann 2019-03-19 10:06:35 +0100
• b224c52376
  🎨 cleanup Niels Lohmann 2019-03-19 09:17:14 +0100
• 37a72dac48
  💚 forgot two semicolons Niels Lohmann 2019-03-18 17:23:34 +0100
• 155d196bfa
  Update CMakeLists.txt Viktor Kirilov 2019-03-18 17:58:35 +0200
• e236b62994
  Update json.hpp jipr311 2019-03-18 16:50:13 +0100
• 365944b0bc
  Merge branch 'develop' into doctest Viktor Kirilov 2019-03-18 16:59:36 +0200
• 8d3f4f21bc
  🔨 clean up Niels Lohmann 2019-03-18 13:53:48 +0100
• 9fc093c9e0
  👷 added targets for infer and oclint Niels Lohmann 2019-03-18 00:19:28 +0100