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

amorfo77/json

Fork 0

mirror of https://github.com/nlohmann/json.git synced 2026-04-11 18:48:52 +00:00

Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/actions/github-script-9.0.0

dependabot/github_actions/github/codeql-action-4.35.1

dependabot/github_actions/lukka/get-cmake-4.3.1

dependabot/github_actions/mymindstorm/setup-emsdk-16

dependabot/github_actions/step-security/harden-runner-2.17.0

dependabot/pip/cmake/requirements/cppcheck-1.5.1

dependabot/pip/docs/mkdocs/mkdocs-redirects-1.2.3

develop

feature/optional

gh-pages

issue2228

issue2615

issue3989

issue4552-ignore

issue4755-cppcheck-warning

master

nlohmann-patch-1-1

nvcc-image

views-test

#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

#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

#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

#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

#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

#4024

#4032

#4033

#4035

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4057

#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

#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

#4477

#4483

#4486

#4487

#4489

#4491

#4495

#4496

#4497

#4498

#4498

#450

#4500

#4502

#4504

#4505

#4506

#4508

#4509

#4512

#4513

#4516

#4517

#4520

#4521

#4522

#4522

#4523

#4524

#4525

#4526

#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

#4563

#4565

#4566

#4567

#4570

#4572

#4573

#4574

#4575

#4577

#4579

#4580

#4581

#4582

#4583

#4584

#4585

#4587

#4587

#4588

#4590

#4591

#4592

#4594

#4595

#4597

#4600

#4601

#4602

#4603

#4604

#4605

#4606

#4607

#4608

#4609

#461

#4611

#4612

#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

#4753

#4754

#4757

#4758

#4758

#4760

#4763

#4764

#4765

#4766

#4768

#4770

#4771

#4774

#4775

#4777

#4779

#4782

#4783

#4785

#4786

#4787

#4789

#4790

#4791

#4793

#4795

#4796

#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

#4920

#4921

#4922

#4923

#4924

#4927

#4929

#4930

#4931

#4932

#4933

#4934

#4935

#4936

#4936

#4937

#4938

#4939

#4940

#4941

#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

#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

#5017

#5018

#5018

#5019

#5020

#5021

#5024

#5025

#5027

#5028

#5029

#5031

#5032

#5033

#5034

#5035

#5037

#5039

#5040

#5041

#5043

#5044

#5049

#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

#5089

#5090

#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

#5123

#5124

#5124

#5125

#5125

#5126

#5126

#5127

#5128

#5131

#5132

#5132

#5133

#5133

#5134

#5134

#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

830c93fd09 📝 fixed example for operator> #1029 Niels Lohmann 2018-03-29 17:07:55 +02:00
c78dbc366c Added test for conversion to string_view Guillaume Racicot 2018-03-29 01:03:57 -04:00
53d8d57921 Amalgamate single include Guillaume Racicot 2018-03-29 01:03:36 -04:00
5f723bbec6 🔨 realized callback parser wirh SAX interface #971 Niels Lohmann 2018-03-28 23:39:39 +02:00
896a9db461 🔨 improved code #1021 Niels Lohmann 2018-03-28 19:37:21 +02:00
73cc5089e3 Using target_compile_features to specify C++ 11 standard Kevin Tonon 2018-03-27 12:51:30 -04:00
a9baab76c2 🚑 fix for #1021 Niels Lohmann 2018-03-28 18:20:55 +02:00
4f6b2b6429 🔨 changed SAX interface Niels Lohmann 2018-03-21 20:12:06 +01:00
2537677e4c ✅ improved test coverage Niels Lohmann 2018-03-20 23:40:01 +01:00
9e1abb4842 ✅ improved coverage Niels Lohmann 2018-03-20 22:39:08 +01:00
1e38ffc014 ✅ more tests Niels Lohmann 2018-03-20 20:04:11 +01:00
25f56ff207 📝 updated documentation Niels Lohmann 2018-03-20 19:22:18 +01:00
99ecca55c4 ✅ improved test coverage Niels Lohmann 2018-03-20 18:49:10 +01:00
9e07e9b4ec ✨ implemented non-throwing binary reader Niels Lohmann 2018-03-19 22:48:13 +01:00
a271ee5f16 ♻️ proper use of SAX parser for binary formats Niels Lohmann 2018-03-18 23:00:45 +01:00
943d641054 🔨 some refactoring Niels Lohmann 2018-03-18 16:07:21 +01:00
22929fe189 🚧 started a SAX/DOM/callback parser Niels Lohmann 2018-03-18 15:13:53 +01:00
375b05a17d 🔨 cleanup Niels Lohmann 2018-03-17 23:31:18 +01:00
606a25195f ✅ improved test coverage Niels Lohmann 2018-03-17 19:15:59 +01:00
c87ffad45c ♻️ implemented a non-recursive parser Niels Lohmann 2018-03-17 14:46:50 +01:00
2a5506ed98 Amalgamated headers Guillaume Racicot 2018-03-16 13:16:10 -04:00
8165707990 basic_json now supports getting many type of strings Guillaume Racicot 2018-03-15 15:35:00 -04:00
27cf05af8d Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-14 22:02:19 +01:00
d2dd27dc3b Merge branch 'release/3.1.2' into develop v3.1.2 Niels Lohmann 2018-03-14 21:48:03 +01:00
183390c10b Merge branch 'release/3.1.2' 3.1.2 Niels Lohmann 2018-03-14 21:47:50 +01:00
8a6c8cb0f7 🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:32:03 +01:00
afef474c0d 🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:09:27 +01:00
a52e8355b8 ⏪ oops Niels Lohmann 2018-03-14 17:32:48 +01:00
21410d50af 🏁 moved /Wall to CMake Niels Lohmann 2018-03-14 17:21:31 +01:00
829ed74d66 🏁 experimenting with /Wall Niels Lohmann 2018-03-14 07:38:22 +01:00
1262d474eb 🏁 fixed an MSVC warning Niels Lohmann 2018-03-14 07:32:28 +01:00
282bafae4f 🔨 fixed compilation error Niels Lohmann 2018-03-14 07:18:42 +01:00
abac6a0e84 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-13 23:58:17 +01:00
919d1fef8f Merge pull request #1009 from nlohmann/user_string_parser Niels Lohmann 2018-03-13 14:52:59 +01:00
8557151d90 ♻️ adjusting lexer/parser in symmetry to #1006 Niels Lohmann 2018-03-12 19:15:11 +01:00
b56ac86471 📝 thanks for #1006 Niels Lohmann 2018-03-12 18:44:19 +01:00
0cab3b2c8e Merge pull request #1006 from agrianius/dump-template Niels Lohmann 2018-03-12 18:41:59 +01:00
3d4f6a2940 🔨 cleaner exception interface Niels Lohmann 2018-03-11 22:47:25 +01:00
ad47b0fbde ♻️ refactored binary readers to use a SAX parser Niels Lohmann 2018-03-11 18:47:38 +01:00
392c033805 test refactoring Vitaliy Manushkin 2018-03-11 00:29:04 +03:00
51349537fc add unit test: checking dump to alternative string type Vitaliy Manushkin 2018-03-10 23:59:10 +03:00
830f3e5290 forward alternative string class from output_adapter to output_string_adapter Vitaliy Manushkin 2018-03-10 23:58:16 +03:00
ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code) Vitaliy Manushkin 2018-03-10 17:36:51 +03:00
faccc37d0d dump to alternate implementation of string, as defined in basic_json template Vitaliy Manushkin 2018-03-10 17:19:28 +03:00
149d2fd09c 💚 improved test coverage Niels Lohmann 2018-03-10 11:24:00 +01:00
6399cd3039 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-10 11:07:36 +01:00
6151dfaed7 👌 made changes proposed in #1001 Niels Lohmann 2018-03-10 11:02:58 +01:00
35e43df625 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-09 21:56:30 +01:00
9918523077 📝 cleanup after #1001 Niels Lohmann 2018-03-09 21:31:46 +01:00
e737de8941 Merge pull request #1001 from nlohmann/leak Niels Lohmann 2018-03-09 21:23:00 +01:00
aa8fc2a41c 🚑 hopefully fixed the memory leak Niels Lohmann 2018-03-08 17:11:15 +01:00
7c1a788893 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-08 07:39:37 +01:00
cf60e18c89 🔥 removing failing test (work on this in branch "leak") Niels Lohmann 2018-03-08 07:39:21 +01:00
97559bb1b2 🔨 trying to fix the leak Niels Lohmann 2018-03-08 07:36:56 +01:00
38345fd06c 👌 fixed some more warnings Niels Lohmann 2018-03-07 22:51:22 +01:00
8b379948d0 🔥 replaced acceptor with SAX parser Niels Lohmann 2018-03-07 22:40:48 +01:00
303a0c5843 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-07 22:26:01 +01:00
d183d34b96 💚 added another test case Niels Lohmann 2018-03-07 22:25:25 +01:00
d2d65bb25b ♻️ refined SFINAE to fix some warnings Niels Lohmann 2018-03-07 22:01:44 +01:00
476b2e09be 💚 added regression tests for #972 and #977 Niels Lohmann 2018-03-06 20:13:31 +01:00
62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion Niels Lohmann 2018-03-06 19:27:39 +01:00
5beab80553 🔨 using the SAX-DOM parser Niels Lohmann 2018-03-06 18:17:07 +01:00
faf2546a15 🔨 simplified SAX-DOM parser Niels Lohmann 2018-03-06 07:19:05 +01:00
5b9d03cfdb 🔨 added SAX-DOM-Parser Niels Lohmann 2018-03-05 21:06:00 +01:00
9d27429527 🔨 added error messages to SAX interface Niels Lohmann 2018-03-05 16:46:35 +01:00
86991d5204 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-05 16:16:43 +01:00
fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition Niels Lohmann 2018-03-05 15:57:57 +01:00
fd30ad8a14 did make amalgamate Mike Bogdanov 2018-03-02 11:47:35 +03:00
2a2ed799b1 pvs_studio fix. misprinted condition Mike Bogdanov 2018-03-02 11:12:44 +03:00
8d104e6fe3 💚 fixed test case Niels Lohmann 2018-02-28 22:40:48 +01:00
5773e164bb 🚨 fixed a linter warning Niels Lohmann 2018-02-28 19:59:54 +01:00
8711ec6034 support construction from other basic_json types Théo DELRIEU 2018-02-27 12:11:04 +01:00
c22f2d41f3 missing CHECK_NOTHROW in unit-udt Théo DELRIEU 2018-02-27 11:09:53 +01:00
3ff9455332 🔨 added a SAX-DOM-Parser Niels Lohmann 2018-02-26 23:39:23 +01:00
21352c4d8e ♻️ refactored SAX parser Niels Lohmann 2018-02-26 20:08:12 +01:00
981e226ca2 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-02-26 20:07:52 +01:00
1f3d2a3be7 📝 overworked README Niels Lohmann 2018-02-26 17:37:24 +01:00
13ca723c38 Merge pull request #981 from wla80/develop Niels Lohmann 2018-02-26 16:51:51 +01:00
05d3bf1699 Make integration section concise Wilson 2018-02-23 15:29:42 -08:00
8d6b3d44d6 👌 fixed some compiler warnings Niels Lohmann 2018-02-25 18:35:16 +01:00
8c7f46f7d0 🔨 removed a logic error and improved coverage Niels Lohmann 2018-02-25 17:10:30 +01:00
922f7a3d0e ✅ added more tests for SAX parsing Niels Lohmann 2018-02-25 14:21:30 +01:00
ac230e8b4b 🔨 fixed test cases to be more robust Niels Lohmann 2018-02-25 10:44:47 +01:00
374ebacc51 ✨ added a SAX parser #971 Niels Lohmann 2018-02-24 18:04:07 +01:00
8968adcd53 Merge branch 'release/3.1.1' into develop v3.1.1 Niels Lohmann 2018-02-13 19:36:35 +01:00
c8ea63a31b Merge branch 'release/3.1.1' Niels Lohmann 2018-02-13 19:36:20 +01:00
8424d10e45 🔖 set version to 3.1.1 Niels Lohmann 2018-02-13 15:59:32 +01:00
938c861a09 🔖 set version to 3.1.1 Niels Lohmann 2018-02-12 22:59:36 +01:00
94b7a8da66 💄 fixed indentation Niels Lohmann 2018-02-12 20:46:14 +01:00
20b5f4d89c Merge pull request #969 from theodelrieu/fix/924 Niels Lohmann 2018-02-12 18:17:59 +01:00
01d6118828 Fix constraints on from_json(CompatibleArrayType) Théo DELRIEU 2018-02-12 10:47:17 +01:00
b02e3bb0b6 Merge pull request #957 from theodelrieu/fix_coveralls Niels Lohmann 2018-02-12 15:02:21 +01:00
41db7cd818 Make the coveralls job use the multiple header version Théo DELRIEU 2018-02-10 21:26:15 +01:00
447f5421eb 🔨 overworked release target Niels Lohmann 2018-02-11 16:50:01 +01:00
61f0bfb15c 🔨 enforce using Python 2 for the wandbox script Niels Lohmann 2018-02-11 14:46:15 +01:00
548f488941 🔨 overworked Makefile Niels Lohmann 2018-02-10 14:46:39 +01:00
865ff00de0 📝 updated documentation wrt. objects #963 Niels Lohmann 2018-02-09 23:37:20 +01:00
addbbbe136 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-02-09 23:32:37 +01:00
0a64982e86 📝 cleanup after #954 Niels Lohmann 2018-02-09 23:32:28 +01:00
e5d538c5ea Merge pull request #954 from pfultz2/patch-1 Niels Lohmann 2018-02-09 23:28:54 +01:00

... 25 26 27 28 29 ...