Commit Graph - json - Gitea: Git with a cup of tea

amorfo77/json

Fork 0

mirror of https://github.com/nlohmann/json.git synced 2026-06-07 05:09:44 +00:00

Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

bson-sizes

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/actions/checkout-6.0.3

dependabot/github_actions/github/codeql-action-4.36.2

dependabot/pip/docs/mkdocs/mkdocs-git-revision-date-localized-plugin-1.5.3

develop

feature/optional

fix-indent_string-resize

gh-pages

issue2228

issue2615

issue3989

issue4440

issue4552-ignore

issue4755-cppcheck-warning

master

nvcc-image

remove-if

#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

#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

#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

#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

#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

#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

#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

#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

#3751

#3759

#3759

#3762

#3762

#3765

#3765

#3767

#378

#3781

#379

#379

#3790

#38

#3809

#3814

#3816

#3822

#3841

#3845

#3862

#3863

#3872

#3876

#3887

#3888

#3889

#3891

#3892

#3895

#3898

#3898

#3899

#3899

#390

#3901

#3906

#391

#3920

#3929

#3932

#3933

#3934

#3937

#395

#3950

#3951

#3964

#3965

#3966

#3969

#3972

#3975

#3978

#3981

#3985

#3988

#3996

#40

#400

#4009

#4010

#4015

#4024

#4032

#4033

#4035

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4057

#4059

#4073

#4078

#4080

#4082

#4082

#4083

#4085

#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

#4214

#4215

#4216

#4217

#4218

#4219

#4222

#4226

#423

#423

#4230

#4231

#4232

#4233

#4237

#4255

#426

#426

#4262

#4265

#4266

#4269

#4273

#4274

#4276

#4277

#4286

#4288

#430

#4310

#4311

#4314

#4323

#4324

#4331

#4333

#4335

#4342

#4343

#4344

#4345

#4346

#435

#4353

#4356

#4356

#4362

#4364

#4365

#4366

#4368

#4372

#4375

#4380

#4385

#439

#4390

#4391

#4393

#4396

#4400

#4406

#441

#441

#4411

#4412

#4414

#4435

#4439

#4439

#4451

#4452

#4452

#4456

#4459

#4465

#4468

#4472

#4476

#4477

#4483

#4486

#4487

#4489

#4491

#4495

#4496

#4497

#4498

#450

#4500

#4502

#4504

#4505

#4506

#4508

#4509

#4512

#4513

#4516

#4517

#4520

#4521

#4522

#4522

#4523

#4524

#4525

#4526

#4528

#4531

#4531

#4532

#4533

#4536

#4537

#4539

#4540

#4541

#4542

#4543

#4544

#4545

#4546

#4547

#4548

#4549

#4550

#4551

#4553

#4555

#4555

#4557

#4558

#4560

#4562

#4563

#4565

#4566

#4567

#4570

#4572

#4573

#4574

#4575

#4577

#4579

#4580

#4581

#4582

#4583

#4584

#4585

#4587

#4588

#4590

#4591

#4592

#4594

#4595

#4597

#4600

#4601

#4602

#4603

#4604

#4605

#4606

#4607

#4608

#4609

#461

#4611

#4612

#4613

#4614

#4615

#4616

#4617

#4620

#4623

#4624

#4625

#4628

#4631

#4633

#4634

#4635

#4636

#4637

#4638

#4639

#4640

#4645

#4646

#4648

#4652

#4654

#4654

#4659

#4661

#4663

#4663

#4664

#4665

#4668

#4669

#4670

#4672

#4677

#4679

#4680

#4682

#4683

#4684

#4688

#4689

#4693

#4695

#4697

#4698

#4699

#4700

#4701

#4704

#4707

#4708

#4709

#4711

#4712

#4715

#4716

#4718

#4719

#4721

#4722

#4723

#4724

#4726

#4727

#4728

#4729

#4734

#4735

#4736

#4737

#4738

#4742

#4743

#4744

#4747

#4748

#4749

#4750

#4753

#4754

#4757

#4758

#4760

#4763

#4764

#4765

#4766

#4768

#4770

#4771

#4774

#4775

#4777

#4779

#4782

#4783

#4785

#4786

#4787

#4789

#4790

#4791

#4793

#4795

#4796

#4797

#4799

#4800

#4801

#4802

#4803

#4805

#4807

#4808

#4809

#4814

#4815

#4816

#4820

#4830

#4833

#4835

#4836

#4837

#4838

#4839

#4840

#4843

#4843

#4846

#4847

#4848

#4849

#4850

#4851

#4853

#4857

#4858

#4860

#4860

#4866

#4867

#4870

#4871

#4872

#4873

#4874

#4876

#4877

#4878

#4879

#4880

#4881

#4884

#4885

#4886

#4887

#4888

#4891

#4893

#4894

#4895

#4896

#4897

#4900

#4902

#4904

#4905

#4906

#4907

#4908

#4909

#4910

#4911

#4912

#4914

#4915

#4917

#4919

#4920

#4921

#4922

#4923

#4924

#4927

#4929

#4930

#4931

#4932

#4933

#4934

#4935

#4936

#4937

#4938

#4939

#4940

#4941

#4942

#4943

#4944

#4947

#4948

#4949

#4950

#4952

#4953

#4954

#4955

#4957

#4958

#4959

#496

#4960

#4963

#4964

#4965

#4965

#4966

#4968

#4969

#4970

#4970

#4971

#4973

#4973

#4976

#4977

#4978

#4979

#4980

#4981

#4982

#4984

#4985

#4986

#4987

#4988

#4989

#4989

#4990

#4991

#4992

#4994

#4994

#4995

#4997

#4999

#5

#5000

#5001

#5003

#5007

#5008

#5011

#5014

#5015

#5015

#5016

#5017

#5018

#5018

#5019

#5020

#5021

#5024

#5025

#5027

#5028

#5029

#5031

#5032

#5033

#5034

#5035

#5037

#5039

#5040

#5041

#5043

#5044

#5049

#5050

#5051

#5052

#5055

#5056

#5057

#5058

#5059

#5061

#5062

#5063

#5064

#5065

#5067

#5070

#5071

#5072

#5075

#5077

#5078

#508

#5080

#5081

#5082

#5083

#5084

#5086

#5087

#5088

#5089

#5090

#5092

#5093

#5094

#5096

#5097

#5098

#5099

#5099

#510

#5100

#5101

#5102

#5102

#5105

#5107

#5108

#5108

#5109

#5109

#5110

#5110

#5111

#5112

#5113

#5114

#5115

#5116

#5118

#5119

#5120

#5123

#5124

#5125

#5126

#5127

#5128

#5131

#5132

#5133

#5134

#5137

#5138

#5139

#5141

#5142

#5142

#5144

#5145

#5146

#5147

#5148

#5151

#5152

#5154

#5156

#5157

#5158

#5159

#5160

#5160

#5161

#5161

#5162

#5163

#5164

#5165

#5166

#5167

#5168

#5169

#5170

#5171

#5172

#5172

#5173

#5174

#5176

#5177

#5178

#5179

#5180

#5181

#5182

#5183

#5184

#5185

#5185

#5186

#5186

#5187

#5188

#5189

#5190

#5191

#5192

#5193

#5193

#5194

#5195

#5199

#5199

#5200

#5201

#5201

#5202

#5202

#5203

#5204

#5204

#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.12.0

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

cd7acc1dc5 Include <string_view> in "nlohmann/json.hpp" when C++17 is used Alexander Karzhenkov 2020-12-20 19:40:36 +05:00
39b8d6bd33 Restore intentionally disrupted C++17 tests Alexander Karzhenkov 2020-12-20 12:43:35 +05:00
aae0e4959e Fix travis configuration to enable C++17 tests Alexander Karzhenkov 2020-12-20 10:18:41 +05:00
8247a217bb Disrupt all C++17 tests to check if they are executed Alexander Karzhenkov 2020-12-19 17:23:58 +05:00
c3c574cf96 Merge pull request #2538 from YarikTH/feature/doctest_v2.4.3 Niels Lohmann 2020-12-18 22:10:42 +01:00
a1772743a1 Doctest is updated to v2.4.3 Krylov Yaroslav 2020-12-18 07:27:22 +03:00
8593260044 Merge pull request #2537 from nlohmann/fix_warnings Niels Lohmann 2020-12-17 21:48:16 +01:00
c026e1a475 🚨 fix warnings Niels Lohmann 2020-12-16 21:44:35 +01:00
af8c6e7aa9 Merge pull request #2533 from nlohmann/c++_future Niels Lohmann 2020-12-16 20:54:09 +01:00
5c1a5bc9c1 Merge pull request #2534 from nlohmann/clarify_license Niels Lohmann 2020-12-16 20:53:38 +01:00
45810082d4 Merge pull request #2536 from nlohmann/shadowing Niels Lohmann 2020-12-16 20:52:46 +01:00
5cc5285fe8 🚨 fix shadowing warning Niels Lohmann 2020-12-15 22:15:36 +01:00
94d177e09a 📄 clarify license Niels Lohmann 2020-12-14 14:58:59 +01:00
467986fe98 ♻️ do not unconditionally redefine C++14 constructs Niels Lohmann 2020-12-14 14:31:27 +01:00
2fc1f694ad Merge pull request #2514 from globberwops/develop Niels Lohmann 2020-12-14 13:41:46 +01:00
1771e9249f Remove comment on CTest inclusion Martin Stump 2020-12-14 10:59:38 +01:00
85ffc85a29 🎨 amalgamate code Niels Lohmann 2020-12-14 10:38:49 +01:00
ea759d0360 Compare to CMAKE_CURRENT_SOURCE_DIR for main project check Martin Stump 2020-12-13 20:34:51 +01:00
97fe455ad5 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-12-12 17:17:43 +01:00
d028eff9e1 📦 add license to include.zip #2487 Niels Lohmann 2020-12-12 17:17:38 +01:00
be32cc4f5e Merge pull request #2525 from YarikTH/feature/doctest_v2.4.1 Niels Lohmann 2020-12-12 15:08:55 +01:00
47c2004f7f Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-12-12 14:10:05 +01:00
fc4040ce9d 🔨 clean up CI Niels Lohmann 2020-12-12 14:09:50 +01:00
6390fca71a Doctest is updated to v2.4.1 Krylov Yaroslav 2020-12-12 05:27:03 +03:00
260be043ba Merge pull request #2406 from leozz37/develop Niels Lohmann 2020-12-11 14:47:18 +01:00
5026acd70c Merge pull request #2444 from linev/fix_gcc48_warn Niels Lohmann 2020-12-11 13:46:41 +01:00
30dd0c0f09 Change underscore placement Sergey Linev 2020-12-11 13:43:17 +01:00
3ad6992f50 Merge pull request #2405 from karzhenkov/fix-json_ref-move Niels Lohmann 2020-12-11 13:36:33 +01:00
e3643aadf7 Merge pull request #2447 from jbzdarkid/develop Niels Lohmann 2020-12-11 13:27:52 +01:00
d9e2b191ad Merge pull request #2512 from YarikTH/issue2490 Niels Lohmann 2020-12-11 13:21:33 +01:00
790508887e Set MAIN_PROJECT=OFF initially Martin Stump 2020-12-09 12:39:44 +01:00
5c589dd138 Add MAIN_PROJECT check for test and install options Martin Stump 2020-12-09 11:37:01 +01:00
972c15f26e ordered_map::insert(InputIt first, InputIt last) is added Krylov Yaroslav 2020-12-07 20:15:41 +03:00
5155cc2c48 Ranged insert test section is added in unit-ordered_json.cpp Krylov Yaroslav 2020-12-07 19:47:41 +03:00
d8d8cbf6e0 🔨 fix site URL Niels Lohmann 2020-12-07 15:30:28 +01:00
3322c9df6e 🔒 use HTTPS Niels Lohmann 2020-12-06 14:41:48 +01:00
cde29b3a11 Merge branch 'develop' of https://github.com/nlohmann/json into develop jbzdarkid 2020-12-03 12:47:34 -08:00
eaac918034 👷 remove clang9 CI Niels Lohmann 2020-12-02 08:58:45 +01:00
9f45d314d5 Apply suggestions from code review Joseph Blackman 2020-11-24 11:02:58 -08:00
64ff1cf90d Add asserts to suppress C28020 jbzdarkid 2020-10-26 13:57:38 -07:00
71cb7d12da Change argument name "subtype" in byte_container_with_subtype Sergey Linev 2020-10-23 13:52:24 +02:00
42a9dc0bc3 Improve json_ref implementation Alexander Karzhenkov 2020-09-27 10:45:21 +05:00
b273f28dae 📝 add CPM.Cmake example leozz37 2020-09-26 19:16:03 -03:00
fd7a9f6007 💰 add sponsor Niels Lohmann 2020-09-23 19:55:03 +02:00
1bcabd9e83 📝 fix URLs to documentation Niels Lohmann 2020-09-02 22:25:32 +02:00
1047d09b2a ✅ annotate non-reproducible tests #2324 Niels Lohmann 2020-08-30 13:23:34 +02:00
d9843fc9fc 📝 add note for Intel compilers #2346 Niels Lohmann 2020-08-29 12:46:47 +02:00
6030a11051 Merge pull request #2367 from nlohmann/hedley14 Niels Lohmann 2020-08-26 08:13:43 +02:00
14f8be11ce Merge branch 'develop' of https://github.com/nlohmann/json into hedley14 Niels Lohmann 2020-08-24 16:12:11 +02:00
b9d76516a2 Merge pull request #2363 from nlohmann/issue2360 Niels Lohmann 2020-08-20 11:38:43 +02:00
9d81eedb42 📝 fix and extend documentation of discarded values Niels Lohmann 2020-08-19 20:26:30 +02:00
b386f4de0b 📝 fix and extend documentation of discarded values Niels Lohmann 2020-08-19 20:26:06 +02:00
3be6ee3525 🚚 remove < from filename to fix Windows build Niels Lohmann 2020-08-16 21:39:40 +02:00
fe507a7ee8 🚚 remove < from filename to fix Windows build Niels Lohmann 2020-08-16 21:36:21 +02:00
6b04f05eba 📝 add more API documentation Niels Lohmann 2020-08-16 21:23:44 +02:00
5c4cc20ed8 📝 add more API documentation Niels Lohmann 2020-08-16 20:48:10 +02:00
a430d25f22 📝 add more API documentation Niels Lohmann 2020-08-16 14:48:48 +02:00
fb5c20134f 📝 add more API documentation Niels Lohmann 2020-08-16 14:27:26 +02:00
d8ed98a7af 📝 add more API documentation Niels Lohmann 2020-08-15 15:18:07 +02:00
1ce0ed5a52 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:58:55 +02:00
0c2088823d 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:56:42 +02:00
fb8adb8e93 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:52:42 +02:00
f6c2947f1e 📝 add more API documentation Niels Lohmann 2020-08-14 13:47:54 +02:00
0356e0c75b 📝 add more API documentation Niels Lohmann 2020-08-14 13:05:16 +02:00
6674561d6a 📝 add more API documentation Niels Lohmann 2020-08-14 10:48:32 +02:00
772f37c12d Merge pull request #2354 from rbuch/develop Niels Lohmann 2020-08-14 06:04:56 +02:00
67d822d951 Fix typos in documentation Ronak Buch 2020-08-13 15:44:58 -04:00
298420263b 🚚 remove quotes from filename to fix Windows build Niels Lohmann 2020-08-13 15:12:41 +02:00
dd2fb3b454 📝 add more API documentation Niels Lohmann 2020-08-13 15:03:28 +02:00
ce6adc447a 📝 add more API documentation Niels Lohmann 2020-08-13 14:04:08 +02:00
d360fec216 📝 add offline pages for docset Niels Lohmann 2020-08-13 13:35:05 +02:00
178125ff9b 📝 add docset Niels Lohmann 2020-08-13 10:52:20 +02:00
8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro Niels Lohmann 2020-08-13 10:06:59 +02:00
874f49e945 📝 add more API documentation Niels Lohmann 2020-08-12 14:29:25 +02:00
fe89049aee 📝 add more API documentation Niels Lohmann 2020-08-12 13:41:59 +02:00
9d726c25d5 ♻️ remove "#define private public" Niels Lohmann 2020-08-12 13:30:06 +02:00
411fc3249b ⬆️ Hedley 14 (dev branch) Niels Lohmann 2020-08-12 13:00:57 +02:00
b888afe5f4 Merge pull request #2349 from nlohmann/issue2348 Niels Lohmann 2020-08-11 09:05:02 +02:00
37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions Niels Lohmann 2020-08-10 22:47:27 +02:00
dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 Niels Lohmann 2020-08-10 20:48:39 +02:00
4080d0b1a4 ✅ add test to compile without exceptions Niels Lohmann 2020-08-10 09:48:11 +02:00
1b28a58280 Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-08-10 09:24:25 +02:00
824d55bf26 📝 fix documentation #1668 Niels Lohmann 2020-08-10 09:24:11 +02:00
e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler Niels Lohmann 2020-08-08 12:15:10 +02:00
41a99567e0 fix cmake script overwriting compiler path Jun Jie 2020-08-07 16:08:02 +08:00
fedf82c904 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-08-07 09:37:56 +02:00
db78ac1d77 Merge branch 'release/3.9.1' into develop v3.9.1 Niels Lohmann 2020-08-06 13:49:29 +02:00
350ff4f7ce Merge branch 'release/3.9.1' into master Niels Lohmann 2020-08-06 13:49:17 +02:00
b3e5cb7f20 🔖 set version to 3.9.1 Niels Lohmann 2020-08-06 13:45:29 +02:00
f4155e4727 Merge pull request #2333 from nlohmann/fallthrough Niels Lohmann 2020-08-01 15:32:21 +02:00
8a54617240 Merge pull request #2332 from nlohmann/issue2330 Niels Lohmann 2020-08-01 12:29:33 +02:00
0326e4e2a6 🚨 fix fallthrough warning Niels Lohmann 2020-07-31 19:24:03 +02:00
3888b1642a 🐛 fix lexer to properly cope with repeated comments #2330 Niels Lohmann 2020-07-31 18:59:22 +02:00
1da931730a Merge pull request #2327 from nlohmann/issue2326 Niels Lohmann 2020-07-31 08:00:08 +02:00
1eedee5e4e Merge pull request #2319 from nlohmann/issue2315 Niels Lohmann 2020-07-31 07:59:18 +02:00
501ad6fc59 📝 fix name of Homebrew formula #2326 Niels Lohmann 2020-07-30 13:31:00 +02:00
35daa5c00b Merge pull request #2320 from wx257osn2/fix-typo Niels Lohmann 2020-07-30 12:27:16 +02:00
2326abc547 ♻️ split regression tests Niels Lohmann 2020-07-30 12:13:05 +02:00
f13af83a94 🐛 add more functions from std::map to nlohmann::ordered_map Niels Lohmann 2020-07-28 21:47:06 +02:00
2d3fe9d135 fix typo I 2020-07-28 21:54:53 +09:00

... 11 12 13 14 15 ...