Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/github/codeql-action-4.32.2

dependabot/github_actions/lukka/get-cmake-4.2.3

dependabot/pip/cmake/requirements/cppcheck-1.5.1

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

#5065

#5067

#5070

#5071

#5072

#5072

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

Mono Color

• db53bdac19 Merge branch 'release/3.5.0' into develop v3.5.0 Niels Lohmann 2018-12-22 00:01:28 +01:00
• cebb4e052a Merge branch 'release/3.5.0' Niels Lohmann 2018-12-22 00:01:18 +01:00
• 78348afeb6 🔖 set version to 3.5.0 Niels Lohmann 2018-12-21 23:52:29 +01:00
• 1107f8cd82 📝 updated documentation for items() function Niels Lohmann 2018-12-21 22:51:12 +01:00
• 98f4e31c3e 📝 formatted picture Niels Lohmann 2018-12-21 18:33:46 +01:00
• 58c269b039 📝 updated documentation Niels Lohmann 2018-12-21 18:27:56 +01:00
• 2182157dc1 📝 update documentation Niels Lohmann 2018-12-21 09:32:35 +01:00
• 45f5611d9b 🚨 fixed two warnings Niels Lohmann 2018-12-20 22:41:48 +01:00
• 117c1d14fb 📝 added contributors to 3.5.0 Niels Lohmann 2018-12-20 22:20:47 +01:00
• d584ab269a 🎨 fixed header Niels Lohmann 2018-12-20 21:58:16 +01:00
• 45a8a093d7 🚨 fixed a warning Niels Lohmann 2018-12-20 21:40:47 +01:00
• 85849940ba Merge pull request #1391 from pratikpc/develop Niels Lohmann 2018-12-20 08:58:08 +01:00
• ebd3f45808 Added Support for Structured Bindings Pratik Chowdhury 2018-12-19 20:17:35 +05:30
• 4f270e38cc Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits Niels Lohmann 2018-12-19 08:24:18 +01:00
• f1080d7c39 Code review. David Avedissian 2018-12-18 20:44:37 +00:00
• 5d390e91ff Merge pull request #1392 from mtalliance/feature/addFileInputAdapter Niels Lohmann 2018-12-16 22:10:03 +01:00
• c1c85b025c Forget one std::FILE Jonathan Dumaresq 2018-12-14 07:33:28 -05:00
• 635a4fc344 use namespace std when possible. Change the name of private variable. Jonathan Dumaresq 2018-12-12 16:33:25 -05:00
• cf31193de2 create single json.hpp file Jonathan Dumaresq 2018-12-12 14:46:52 -05:00
• a794cfdba3 refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that Jonathan Dumaresq 2018-12-12 14:46:17 -05:00
• 91ff96a737 remove the const attribute Jonathan Dumaresq 2018-12-12 14:16:12 -05:00
• b7a2642fba remove comment Jonathan Dumaresq 2018-12-12 14:15:49 -05:00
• fa7f1a524e new unified json.hpp generated with make amalgamate Jonathan Dumaresq 2018-12-12 10:19:22 -05:00
• ef283e0cf8 add tests to cover the new input adapter Jonathan Dumaresq 2018-12-12 10:18:37 -05:00
• 3335da622a remove non usefull code. Jonathan Dumaresq 2018-12-12 09:32:52 -05:00
• ae48acbb23 remove non usefull code. Add small description Jonathan Dumaresq 2018-12-12 09:28:42 -05:00
• 52f6fd1d91 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library. Jonathan Dumaresq 2018-12-11 13:17:13 -05:00
• 67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library. Jonathan Dumaresq 2018-12-11 09:33:30 -05:00
• 2c23f0a346 Changes requested from code review. David Avedissian 2018-12-08 15:46:33 +00:00
• e73dfef6e5 Merge pull request #1382 from kjpus/patch-1 Niels Lohmann 2018-12-04 20:02:38 +01:00
• 767a3a327d Link to issue #958 broken kjpus 2018-12-04 10:03:10 -05:00
• d53873a251 Merge pull request #1363 from theodelrieu/doc/implicit_conversions Niels Lohmann 2018-12-02 17:27:46 +01:00
• 7a56f5a42b Merge pull request #1380 from manu-chroma/patch-1 Niels Lohmann 2018-12-02 17:25:38 +01:00
• 5de184b8fb readme: fix typo Manvendra Singh 2018-12-02 01:50:57 +05:30
• ef90d62ddf 🚨 fixed warning #1364 Niels Lohmann 2018-11-21 21:17:38 +01:00
• 7b961368d5 recommend using explicit from JSON conversions Théo DELRIEU 2018-11-19 14:25:29 +01:00
• da81e7be22 🏁 adding parentheses around std::snprintf calls #1337 Niels Lohmann 2018-11-09 21:18:02 +01:00
• f80efd3954 💄 cleanup Niels Lohmann 2018-11-09 21:10:32 +01:00
• 35829928da Merge pull request #1343 from mefyl/develop Niels Lohmann 2018-11-09 21:07:36 +01:00
• f86090aafc Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig Niels Lohmann 2018-11-08 18:39:26 +01:00
• 30e1cbb0df Merge pull request #1346 from ax3l/fix-mergePatchShadowParam Niels Lohmann 2018-11-08 18:38:40 +01:00
• aa10382629 Set eofbit on exhausted input stream. mefyl 2018-11-07 16:02:50 +01:00
• 798754dfb6 Amalgamate Headers Axel Huebl 2018-11-08 10:35:45 +01:00
• 97b81da840 merge_patch: rename parameter Axel Huebl 2018-11-08 10:31:47 +01:00
• ffe08983dd :meson: install headers + pkg-config Millian Poquet 2018-11-07 23:56:55 +01:00
• f665a92330 Implement SFINAE friendly iterator_traits and use that instead. David Avedissian 2018-11-07 18:39:25 +00:00
• d2e6e1bf58 Merge pull request #1329 from ax3l/fix-typosWhitespaces Niels Lohmann 2018-11-02 18:23:42 +01:00
• a7567bc596 Remove EOL whitespaces in natvis Axel Huebl 2018-11-02 10:42:48 +01:00
• f049836d68 CMake: Optional Install if Embedded Axel Huebl 2018-11-02 10:15:27 +01:00
• 689382a722 Fix EOL Whitespaces & CMake Spelling Axel Huebl 2018-11-02 09:35:17 +01:00
• 2f73a4d1f3 🚨 fixed a linter warning Niels Lohmann 2018-10-31 20:30:24 +01:00
• e3c28afb61 Merge branch 'release/3.4.0' into develop v3.4.0 Niels Lohmann 2018-10-30 22:20:29 +01:00
• 6708f22cd4 Merge branch 'release/3.4.0' Niels Lohmann 2018-10-30 22:20:12 +01:00
• 0f3c74d821 🔖 set version to 3.4.0 Niels Lohmann 2018-10-30 22:18:45 +01:00
• 7b2f8cce03 🔖 set version to 3.4.0 Niels Lohmann 2018-10-30 21:30:20 +01:00
• 8cee0e38d9 🚑 fixed #1319 Niels Lohmann 2018-10-30 17:29:05 +01:00
• 856fc31d0a 💄 fixed indentation Niels Lohmann 2018-10-29 19:44:19 +01:00
• 39419cd5c4 🚨 fixed another linter warning Niels Lohmann 2018-10-29 18:51:30 +01:00
• 86b5ce953a 📝 added examples for BSON functions Niels Lohmann 2018-10-28 15:09:26 +01:00
• d2e4f0b0d9 ✏️ fixed some typos Niels Lohmann 2018-10-28 14:20:20 +01:00
• f0c1459554 🐛 fixed a bug parsing BSON strings #1320 Niels Lohmann 2018-10-28 09:16:40 +01:00
• 24946f67f1 🚨 fixed some more linter warnings Niels Lohmann 2018-10-28 09:15:41 +01:00
• 7d0dc10169 🚨 fixed a linter warning Niels Lohmann 2018-10-27 18:34:35 +02:00
• 45a761bd60 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-10-27 18:31:06 +02:00
• 4e765596f7 🔨 small improvements Niels Lohmann 2018-10-27 18:31:03 +02:00
• 1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char Niels Lohmann 2018-10-27 16:56:00 +02:00
• 0e7be06bef Merge pull request #1323 from nlohmann/feature/enum_json_mapping Niels Lohmann 2018-10-27 16:55:39 +02:00
• 85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping Niels Lohmann 2018-10-27 16:52:59 +02:00
• 5a6bdf5934 Merge branch 'develop' into feature/convert_char Niels Lohmann 2018-10-27 16:48:48 +02:00
• 037e93f5c0 Merge pull request #1320 from nlohmann/julian-becker-feature/bson Niels Lohmann 2018-10-27 16:37:54 +02:00
• 9f48bb6937 ⚡ replaced vector by array #1323 Niels Lohmann 2018-10-27 09:58:23 +02:00
• 6384fe28db 🚨 fixed another linter warning Niels Lohmann 2018-10-26 23:12:41 +02:00
• ad639ad5e6 ✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 Niels Lohmann 2018-10-26 14:48:20 +02:00
• 544150d5a5 🚨 fixed another linter warning Niels Lohmann 2018-10-26 11:10:49 +02:00
• c2e175763c 👌 added another conversion function #1315 Niels Lohmann 2018-10-25 22:47:08 +02:00
• d97fa30795 👌 fixed comment #1320 Niels Lohmann 2018-10-25 22:29:27 +02:00
• 7ce720b700 🚨 fixed coverage Niels Lohmann 2018-10-25 18:21:50 +02:00
• 19647e083c 🚨 fixed compiler warnings Niels Lohmann 2018-10-25 14:27:55 +02:00
• 62126278a6 🔨 added fix for arrays Niels Lohmann 2018-10-25 13:01:18 +02:00
• 1968e5c793 🎨 clean up binary formats Niels Lohmann 2018-10-24 23:39:30 +02:00
• 4d1eaace8c 🔨 fixed fuzz code to avoid false positives in case of discarded values Niels Lohmann 2018-10-24 18:55:08 +02:00
• e2c5913a50 🚧 some changes to the BSON code Niels Lohmann 2018-10-24 15:43:37 +02:00
• bba159121f Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson Niels Lohmann 2018-10-24 15:03:15 +02:00
• f102df3cba 📝 updated documentation #1314 Niels Lohmann 2018-10-24 09:28:57 +02:00
• 7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors Niels Lohmann 2018-10-24 08:40:58 +02:00
• 20038e2703 📝 added a note to the discussion #1286 Niels Lohmann 2018-10-23 23:00:43 +02:00
• 87ef3f25f2 ✏️ fixed a typo #1314 Niels Lohmann 2018-10-23 22:56:10 +02:00
• b49f76931f 👌 replaced static_cast to CharType by conversion function #1286 Niels Lohmann 2018-10-23 17:49:04 +02:00
• 2343d9caeb 💚 additional tests from the Unicode spec #1198 Niels Lohmann 2018-10-23 17:22:13 +02:00
• 951a7a6455 🚧 fixed test cases #1198 Niels Lohmann 2018-10-22 18:20:45 +02:00
• c51b1e6fab 🚧 fixed an issue with ensure_ascii #1198 Niels Lohmann 2018-10-22 15:53:36 +02:00
• c7af027cbb 🚧 respect ensure_ascii parameter #1198 Niels Lohmann 2018-10-22 09:18:16 +02:00
• e5dce64115 💚 added tests #1198 Niels Lohmann 2018-10-21 23:26:25 +02:00
• c5821d91e5 🚧 overworked error handlers #1198 Niels Lohmann 2018-10-21 11:49:37 +02:00
• ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message Julian Becker 2018-10-18 20:05:46 +02:00
• 9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299 Niels Lohmann 2018-10-18 19:18:48 +02:00
• b553a8a93c Merge pull request #1305 from koponomarenko/add-meson-info Niels Lohmann 2018-10-18 10:55:25 +02:00
• 5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp Julian Becker 2018-10-18 06:38:34 +02:00
• 8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() Julian Becker 2018-10-17 21:47:01 +02:00
• f0c55ce0e0 Add Meson related info to README Kostiantyn Ponomarenko 2018-10-17 21:37:08 +03:00