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

• 5fa5c17bc6
  ✏️ cleanup after #595 Niels Lohmann 2017-06-10 18:29:16 +0200
• 6caad48e44 Merge pull request #595 from HenryRLee/iterator_arithmetic Niels Lohmann 2017-06-10 18:26:48 +0200
• e12c2ee6a8 Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-09 20:47:42 +1000
• 1d906c788e Merge c319583c2a into 52f934cbbf Pamela96 2017-06-08 10:43:45 +0000
• 52f934cbbf Merge pull request #609 from theodelrieu/develop Niels Lohmann 2017-06-07 16:38:23 +0200
• cea39dfaa8
  fix #600 Théo DELRIEU 2017-06-06 14:18:32 +0200
• 6661ec755b Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-07 18:01:46 +1000
• 0f065edff6 Revert a change in reverse iterator to pass the test cases HenryLee 2017-06-07 18:01:01 +1000
• 3250fbc416 Merge e8bc2279d7 into 92ef19696a ashghost 2017-06-06 19:29:02 +0000
• 92ef19696a
  ✏️ cleanup after #598 Niels Lohmann 2017-06-06 20:48:11 +0200
• bfdf0d1ce6 Merge pull request #598 from HenryRLee/issue550 Niels Lohmann 2017-06-06 20:41:42 +0200
• 85de93ba93
  add std::pair<CompatibleStringType, T> support Théo DELRIEU 2017-06-06 13:44:35 +0200
• c98169d0d5 Revert "Change iterator category to random access" HenryLee 2017-06-05 21:59:17 +1000
• fb91aa81da Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-05 20:24:21 +1000
• 2ba554e442 Merge branch 'develop' into issue550 HenryLee 2017-06-05 20:24:08 +1000
• 1a9d76679a
  🐛 fixed the issue with GCC7 #590 Niels Lohmann 2017-06-04 18:40:32 +0200
• 83b2f65f74 Merge 1638de2abc into d19c5ced4b ibroheem 2017-06-02 18:24:45 +0000
• e6a5f5cca1 Merge a8af911e80 into d19c5ced4b Ralph Tandetzky 2017-06-02 17:52:06 +0000
• d19c5ced4b
  🐛 skipping BOM for iterators #602 Niels Lohmann 2017-06-02 12:38:32 +0200
• c043ba6978
  🔥 removed failing test #529 Niels Lohmann 2017-06-01 07:32:39 +0200
• f2e1643039 Add test cases for iterator to const iterator assignment HenryLee 2017-05-31 00:50:40 +1000
• 2d5f0c0549 Redefine the converting assignment in iterator HenryLee 2017-05-31 00:50:14 +1000
• c09a4cbbd7 Add test cases for iterator to const iterator conversion HenryLee 2017-05-31 00:31:16 +1000
• 0a51fb22ed Fix indentation HenryLee 2017-05-30 23:37:24 +1000
• 881cd3f420 Remove the iter_impl<const basic_json> copy constructor and copy assignment HenryLee 2017-05-30 20:57:22 +1000
• 790e7ca9e9 Add struct keyword in front of internal_iterator HenryLee 2017-05-30 20:27:05 +1000
• ce39330ff8 Add converting constructors for iterator HenryLee 2017-05-30 20:23:25 +1000
• c4ab8f827e Change iterator category to random access HenryLee 2017-05-30 19:44:55 +1000
• daea213b44 Use static cast in the implementation of the operators of reverse iterator HenryLee 2017-05-29 23:56:21 +1000
• 0c2ed00ebe Add missing test cases for n + it arithmetic in iterators HenryLee 2017-05-29 22:39:27 +1000
• 5b245dae06 Comment out the exception message check in operator[] of reverse iterator HenryLee 2017-05-29 22:19:10 +1000
• e42db27d6d Fix the indentation from the latest commit HenryLee 2017-05-29 20:02:58 +1000
• 3aef1a582e Change the definition of the operator override of reverse iterator to using the result of the base class directly HenryLee 2017-05-29 19:45:34 +1000
• a3bf0131c4 Fix some more reverse iterator arithmetic test codes HenryLee 2017-05-29 19:43:45 +1000
• adc73d6d5f Fix the arithmetic mistakes in reverse iterator HenryLee 2017-05-29 18:52:53 +1000
• ed62129f8e Override n + iterator operator in the iterator HenryLee 2017-05-27 13:44:14 +1000
• 0e1a46d36f Merge f0cc4ef72b into c0d511ea50 Henry Lee 2017-05-26 16:10:54 +0000
• f0cc4ef72b Override n + iterator operator in the iterator HenryLee 2017-05-27 01:56:20 +1000
• c4e399ce0a Override n + iterator operator in the iterator HenryLee 2017-05-27 01:42:38 +1000
• 52adf3fd5b
  🔨 fixed compilation Niels Lohmann 2017-05-22 22:59:57 +0200
• 9a576fe1d9
  ✅ added test for #367 Niels Lohmann 2017-05-22 22:49:39 +0200
• c7bd01edf2
  🔨 trying something #367 Niels Lohmann 2017-05-22 17:06:46 +0200
• 9e507dfad5
  ✅ tests and fix for #367 Niels Lohmann 2017-05-21 16:36:51 +0200
• 16b63d3197
  🔨 working toward #367 Niels Lohmann 2017-05-20 12:44:13 +0200
• 8a35fdd8f5
  🔨 overworked accept() function Niels Lohmann 2017-05-20 12:24:13 +0200
• 9ddc69f3a9
  🐛 adjusting fix for future versions #586 Niels Lohmann 2017-05-20 10:49:06 +0200
• 99cb095e89
  🐛 fix for #586 Niels Lohmann 2017-05-20 10:34:49 +0200
• 0f4131d138 Merge pull request #583 from zhaohuaxishi/doxygen_error Niels Lohmann 2017-05-15 21:09:43 +0200
• 0c3ffe12cd
  ⏪ reverting first/second experiment #350 Niels Lohmann 2017-05-15 21:07:58 +0200
• b8dff3bc16 remove the redundant @ref command 郭荣飞 2017-05-14 07:50:26 +0800
• 723c875604
  💬 replaced "backspace" with "backslash" #509 Niels Lohmann 2017-05-13 19:56:38 +0200
• dfa371c436 fix doxygen error of basic_json::get() 郭荣飞 2017-05-13 23:13:04 +0800
• 9b764ee5d6
  🏁 fix for #581 Niels Lohmann 2017-05-13 12:27:37 +0200
• 978255da8c
  📝 updated contribution guidelines Niels Lohmann 2017-05-13 11:57:15 +0200
• 8b88e1b266 Merge pull request #579 from Type1J/develop_feature_first_second Niels Lohmann 2017-05-13 11:37:57 +0200
• b78457b792 Making comparison operators const. Jay Sistar 2017-05-11 13:22:47 -0400
• 00d841bfda Adding equal and not equal operators to proxys. Jay Sistar 2017-05-11 14:50:59 +0000
• d6c78dacd8 Fixing assignement for iterator wrapper second, and adding unit test Jay Sistar 2017-05-10 17:53:27 +0000
• 5beea35443 Merge pull request #578 from Type1J/develop_feature_first_second Niels Lohmann 2017-05-10 17:25:54 +0200
• 15ef9b8a35 Merge pull request #576 from Type1J/develop Niels Lohmann 2017-05-10 16:32:14 +0200
• 6a656ed375 Adding first and second properties to iteration_proxy_internal Jay Sistar 2017-05-10 13:20:52 +0000
• 2afbd33472
  🔨 working on #367 Niels Lohmann 2017-05-10 12:06:24 +0200
• 87744fd594 Missed one. Jay Sistar 2017-05-09 02:04:02 +0000
• 0719287e44 Reducing chatter about Meson. Jay Sistar 2017-05-09 02:01:55 +0000
• 31fe2f5825 Adding support for Meson. Jay Sistar 2017-05-08 13:35:00 +0000
• 962da00171
  ✨ implemented an indentation character #520 Niels Lohmann 2017-05-07 19:27:40 +0200
• fba1bcdd0b
  🐛 fixing #575 Niels Lohmann 2017-05-07 13:41:48 +0200
• 56ac7908f1
  Merge branch 'feature/manual_lexer' into develop Niels Lohmann 2017-05-05 18:27:56 +0200
• dbcb032f22
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-05-05 16:48:47 +0200
• ecf895f2d1
  📝 mentioned value function on main doc page #570 Niels Lohmann 2017-05-05 16:42:22 +0200
• fe6b218fab
  Update Niels Lohmann 2017-05-05 16:41:48 +0200
• be7efe798b Merge 89ffcac642 into 19d2dec8b6 Per-Arne Andersen 2017-05-04 07:22:30 +0000
• 3d45569fd3 Merge 54c966979c into 19d2dec8b6 Cristian Maglie 2017-05-04 06:57:26 +0000
• 19d2dec8b6
  📝 added badge from isitmaintained.com Niels Lohmann 2017-05-03 22:49:21 +0200
• 8b9f51179e
  ✨ started working on #458 Niels Lohmann 2017-04-24 17:46:21 +0200
• cfc2e8391c
  🔨 removed too long running tests Niels Lohmann 2017-04-24 15:07:43 +0200
• 6d2c0a7928
  ✅ added more Unicode test cases Niels Lohmann 2017-04-23 22:54:21 +0200
• c42273d2a0
  📝 fixed documentation #565 Niels Lohmann 2017-04-23 21:46:30 +0200
• 529489661e
  Update Niels Lohmann 2017-04-23 21:43:42 +0200
• 2df8f12c09
  🏁 another fix for MSVC #464 Niels Lohmann 2017-04-23 20:51:29 +0200
• 734297ff45
  🔨 cleanup Niels Lohmann 2017-04-23 20:32:05 +0200
• 01e05d89e9
  🔨 fixed a compiler warning Niels Lohmann 2017-04-23 18:40:17 +0200
• b686cc6ad9
  🔨 removed #ifdefs Niels Lohmann 2017-04-23 18:34:14 +0200
• 5febd04a26
  🐛 fixed test suite Niels Lohmann 2017-04-23 18:22:35 +0200
• 4aedae400e
  ✅ added exhaustive UTF-8 tests Niels Lohmann 2017-04-23 15:12:50 +0200
• e24df7eca9
  📝 improved documentation Niels Lohmann 2017-04-23 15:10:40 +0200
• 2a21146160
  Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-22 11:35:58 +0200
• 4b316ec528
  Merge branch 'feature/insert' into develop Niels Lohmann 2017-04-22 09:58:37 +0200
• 9b32f72584
  📝 fixed examples for Wandbox Niels Lohmann 2017-04-21 22:07:07 +0200
• c319583c2a Create lugares Pamela96 2017-04-18 10:19:35 -0500
• b5b58151f4 Merge 52ac56c33e into c0d511ea50 The Gitter Badger 2017-04-17 23:56:55 +0000
• 54c966979c Fix warning: enumeration value not handled in switch Cristian Maglie 2017-04-15 13:26:25 +0200
• 14dcd918a8 Fix warning: enumeration value not handled in switch Cristian Maglie 2017-04-15 13:18:41 +0200
• 523cc21514 Fix warning: enumeration value not handled in switch Cristian Maglie 2017-04-15 13:13:36 +0200
• cdecd1b162 Fix warning: enumeration value not handled in switch Cristian Maglie 2017-04-15 11:46:42 +0200
• db9bf953f3
  🔨 improved diagnostic output Niels Lohmann 2017-04-15 10:40:10 +0200
• 717106eced
  🔨 templated output_adapter and used in class serializer Niels Lohmann 2017-04-14 19:49:05 +0200
• aea47422a2
  📝 updated links and output Niels Lohmann 2017-04-14 18:13:01 +0200
• 6b6e554067
  🐛 added missing header Niels Lohmann 2017-04-14 17:37:28 +0200
• 951d0920fc
  🐛 fixed README example Niels Lohmann 2017-04-14 17:36:45 +0200