Commit graph

Select branches

Hide pull requests

config-refactor-1102

develop

feature-plugins

linting-rules-1742

poetry-2.0-pyproject-fix

release

renovate/cryptography-44.x-lockfile

renovate/cryptography-45.x-lockfile

renovate/poethepoet-0.x-lockfile

renovate/ruff-0.x-lockfile

renovate/tox-4.x-lockfile

ruamel-tox-example

#1000

#1001

#1002

#1003

#1004

#101

#101

#1011

#1012

#1016

#1018

#102

#102

#1022

#1023

#1027

#1028

#103

#1031

#1032

#1035

#1038

#104

#1040

#1042

#1043

#1044

#1045

#105

#1050

#1053

#1054

#1056

#106

#1062

#1063

#1067

#1069

#1070

#1073

#1074

#1075

#1076

#1078

#108

#1081

#1082

#1084

#1085

#1086

#1088

#109

#1090

#1091

#1092

#1093

#1094

#1095

#11

#11

#110

#1101

#1104

#1105

#1108

#1109

#1110

#1111

#1113

#1114

#1115

#1116

#1117

#1118

#112

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#1129

#113

#1130

#1131

#1132

#1133

#1134

#1135

#1136

#1137

#1138

#1139

#1140

#1145

#1146

#1147

#1148

#1150

#1153

#1154

#1156

#1158

#1159

#1160

#1163

#1164

#1166

#1167

#1168

#1169

#1174

#1175

#1176

#1177

#118

#1185

#1186

#1187

#1188

#1189

#1190

#1193

#1194

#1195

#1199

#1200

#1204

#1209

#1210

#1211

#1213

#1215

#1216

#1219

#122

#122

#1220

#1221

#1222

#1223

#1228

#1229

#123

#123

#1233

#1234

#1236

#1238

#124

#1240

#1241

#1244

#125

#1250

#1254

#1258

#1259

#126

#1260

#1262

#1265

#1266

#1269

#127

#1271

#1275

#1276

#1277

#1278

#1279

#1280

#1281

#1282

#1283

#1285

#1288

#129

#1290

#1296

#1298

#1299

#130

#1301

#1302

#1307

#1309

#131

#1313

#1314

#1315

#1318

#1319

#132

#1320

#1322

#1324

#1325

#1327

#1328

#1329

#133

#133

#1331

#1332

#1333

#1334

#1337

#1339

#1342

#1343

#1344

#1345

#1346

#1347

#1348

#1351

#1354

#1355

#1356

#1359

#1360

#1362

#1365

#1366

#1367

#1368

#1369

#1370

#1373

#1374

#1375

#1378

#1379

#138

#1381

#1382

#1383

#1384

#1385

#1387

#1389

#139

#1392

#1395

#1397

#1398

#1399

#1400

#1401

#1404

#1407

#1412

#1414

#1416

#1417

#1418

#1423

#1424

#1426

#1427

#143

#1430

#1436

#1438

#1439

#1440

#1441

#1442

#1443

#1447

#1449

#145

#1450

#1452

#1453

#1458

#1459

#146

#1460

#1461

#1462

#1463

#1466

#1467

#1468

#1471

#1475

#1477

#1478

#1479

#1480

#1482

#1484

#1487

#149

#1490

#1492

#1495

#1497

#1499

#150

#1500

#1502

#1503

#1504

#1505

#1506

#1507

#1508

#1510

#1511

#1512

#1513

#1514

#1515

#1516

#1518

#1519

#1520

#1522

#1523

#1524

#1526

#1527

#1528

#1529

#1530

#1531

#1532

#1533

#1535

#1536

#1538

#1539

#154

#1540

#1541

#1542

#1546

#1550

#1551

#1552

#1553

#1554

#1555

#1556

#1561

#1562

#1563

#1564

#1565

#1566

#1567

#1568

#1569

#157

#1571

#1572

#1574

#1575

#1576

#1577

#1578

#1579

#158

#1580

#1581

#1582

#1583

#1584

#1585

#1587

#1588

#1591

#1592

#1594

#1595

#1598

#1600

#1602

#1603

#1604

#161

#1611

#1614

#1618

#1621

#1624

#1625

#1626

#1627

#1628

#1629

#163

#1630

#1631

#1632

#1636

#164

#1640

#1642

#1646

#1647

#1648

#1653

#1654

#1655

#1657

#1659

#1660

#1662

#1663

#1667

#1669

#167

#1673

#1674

#1679

#168

#168

#1680

#1684

#1685

#1686

#1687

#1690

#1691

#1693

#1695

#1697

#1698

#17

#17

#1701

#1702

#1703

#1704

#1705

#1706

#1707

#1708

#1709

#1710

#1711

#1712

#1713

#1714

#1715

#1716

#1718

#1719

#1720

#1722

#1723

#1726

#1727

#1728

#1729

#173

#1731

#1732

#1733

#1735

#1738

#1739

#1740

#1741

#1743

#1744

#1745

#1746

#1748

#1749

#175

#1751

#1752

#1753

#1754

#1757

#1758

#1759

#1760

#1761

#1762

#1763

#1765

#1767

#1768

#1769

#1770

#1773

#1774

#1775

#1776

#1778

#1779

#178

#1780

#1781

#1782

#1785

#1787

#1788

#1789

#1790

#1791

#1792

#1794

#1795

#1796

#1797

#1798

#18

#18

#180

#1802

#1803

#1804

#1806

#1807

#181

#1810

#1811

#1812

#1813

#1814

#1815

#1816

#1818

#1820

#1821

#1822

#1824

#1825

#1826

#1828

#1829

#1830

#1831

#1833

#1834

#1837

#1838

#1844

#1845

#1846

#1847

#1848

#1849

#1850

#1851

#1852

#1854

#1855

#1856

#1857

#1858

#1860

#1861

#1862

#1863

#1864

#1867

#1868

#1868

#1872

#1872

#1873

#1873

#1874

#1874

#1876

#1878

#188

#1880

#1884

#1889

#1890

#1892

#1895

#1896

#1897

#1898

#1899

#19

#19

#1900

#1904

#1914

#1918

#1918

#1920

#1920

#1922

#1923

#1924

#1925

#1926

#1927

#1928

#1929

#1930

#1931

#1933

#1935

#1936

#1937

#1938

#1939

#1940

#1942

#1943

#1944

#1945

#1946

#1947

#1948

#1951

#1952

#1955

#1959

#1960

#1962

#1965

#1965

#1966

#1967

#1970

#1971

#1972

#1973

#1974

#1978

#198

#198

#1980

#1981

#1982

#1983

#1984

#1986

#1988

#1989

#1991

#1991

#1993

#1993

#1994

#1995

#1998

#1998

#20

#20

#200

#200

#2000

#2000

#2001

#2001

#204

#206

#209

#209

#211

#211

#213

#217

#218

#219

#219

#225

#226

#232

#235

#239

#24

#24

#247

#248

#251

#251

#252

#253

#255

#258

#258

#26

#26

#261

#267

#278

#280

#280

#283

#289

#292

#292

#294

#298

#299

#30

#30

#300

#301

#301

#304

#305

#306

#309

#310

#313

#314

#314

#319

#319

#320

#320

#321

#323

#323

#325

#326

#326

#33

#33

#331

#336

#336

#34

#34

#341

#342

#342

#346

#347

#349

#350

#355

#355

#357

#359

#359

#370

#375

#376

#376

#377

#378

#381

#381

#387

#387

#39

#39

#393

#393

#397

#399

#400

#403

#403

#405

#405

#416

#417

#418

#419

#42

#42

#420

#423

#425

#43

#430

#431

#435

#44

#442

#447

#448

#448

#457

#458

#464

#469

#470

#471

#474

#476

#477

#49

#49

#492

#495

#498

#499

#5

#5

#500

#501

#506

#509

#51

#51

#515

#516

#516

#517

#517

#518

#525

#526

#527

#531

#54

#54

#542

#543

#543

#544

#545

#550

#553

#554

#554

#555

#556

#56

#56

#561

#563

#564

#571

#58

#58

#583

#585

#59

#59

#592

#595

#596

#599

#601

#603

#604

#606

#608

#609

#61

#61

#611

#612

#616

#617

#620

#621

#623

#624

#626

#627

#628

#629

#633

#634

#636

#637

#639

#640

#641

#644

#645

#646

#649

#65

#65

#650

#655

#657

#66

#66

#660

#665

#670

#672

#679

#682

#683

#684

#688

#692

#694

#695

#697

#698

#699

#70

#70

#702

#703

#704

#705

#706

#708

#710

#712

#719

#721

#722

#723

#725

#726

#729

#730

#731

#733

#734

#736

#740

#742

#744

#748

#749

#750

#751

#752

#753

#755

#756

#759

#761

#762

#763

#765

#767

#769

#772

#773

#774

#777

#778

#782

#784

#785

#786

#789

#791

#792

#794

#795

#796

#797

#80

#80

#801

#802

#803

#804

#805

#806

#807

#808

#809

#812

#819

#82

#82

#820

#822

#823

#824

#826

#829

#83

#83

#830

#833

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#85

#85

#850

#852

#854

#857

#86

#86

#868

#869

#871

#872

#879

#88

#88

#885

#886

#887

#895

#897

#898

#90

#90

#900

#902

#904

#905

#907

#908

#909

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#92

#923

#924

#925

#927

#928

#933

#934

#935

#936

#937

#938

#94

#94

#940

#941

#942

#944

#947

#948

#951

#952

#953

#954

#956

#957

#958

#959

#961

#963

#964

#965

#969

#97

#97

#972

#975

#976

#980

#981

#982

#984

#985

#987

#988

#989

#99

#990

#991

#993

#994

1.2.0

1.3.1

1.8.4

1.8.6

1.9.3

1.9.5

1.9.6

1.9.7

1.9.8

prjct-0.6.0

v0.2

v0.2.5

v0.3

v1.8.0

v1.9.0

v1.9.9

v2.0

v2.0-rc2

v2.0-rc3

v2.0-rc4

v2.0.0

v2.0.1

v2.0.1-beta

v2.1-beta

v2.1-beta2

v2.1-beta3

v2.1-beta4

v2.1-beta5

v2.1-beta6

v2.1.1

v2.1.1-beta

v2.1.post2

v2.2

v2.2-beta

v2.2-beta2

v2.2.1-beta

v2.2.1-beta2

v2.3

v2.3-beta

v2.3.1

v2.3.1-beta

v2.4

v2.4-beta

v2.4.1

v2.4.2

v2.4.3

v2.4.3-beta

v2.4.4

v2.4.4-beta

v2.4.5

v2.5

v2.5-beta

v2.5.1-alpha

v2.6

v2.6-beta

v2.6-beta2

v2.6-beta3

v2.6-beta4

v2.6-beta5

v2.7

v2.7-beta

v2.7.1

v2.7.1-beta

v2.7.2-beta

v2.8

v2.8-beta

v2.8.1

v2.8.1-beta

v2.8.2

v2.8.2-beta

v2.8.3

v2.8.3-beta

v2.8.4

v2.8.4-beta

v2.8.4-beta1

v2.8.4-beta2

v3.0

v3.0-beta

v3.0-beta2

v3.1

v3.1-beta

v3.1-beta2

v3.2

v3.2-beta

v3.3

v3.3-beta

v3.3-beta2

v4.0

v4.0-beta

v4.0-beta2

v4.0-beta3

v4.0.1

v4.0.1-beta

v4.1

v4.1-beta

v4.1-beta2

v4.2

v4.2-beta

v4.2.1

Mono Color

• e136ca60c1 Merge remote-tracking branch 'upstream/develop' into dayone2 dbxnr 2020-01-21 17:30:54 +00:00
• a016aee7d4 Delete dayone2.py, fix small bug with import_file() error handling dbxnr 2020-01-21 17:22:18 +00:00
• c16afe1605 Add support for DayOne2 dbxnr 2020-01-10 15:05:10 +00:00
• d9161f2fe7 Merge branch 'develop' of https://github.com/jrnl-org/jrnl into dayone2 dbxnr 2020-01-21 17:27:09 +00:00
• 01546672be Delete dayone2.py, fix small bug with import_file() error handling dbxnr 2020-01-21 17:22:18 +00:00
• 6f84eec165 Add support for DayOne2 dbxnr 2020-01-10 15:05:10 +00:00
• c20fa18f9b
  Fix typo in encryption docs #812 Aurélien Ooms 2020-01-21 09:34:14 +01:00
• 306e048f19 Updating changelog [ci skip] #819 Jrnl Bot 2020-01-17 03:21:23 +00:00
• 6ea492e25a
  Merge pull request #789 from dbxnr/dbxnr-patch-1 Jonathan Wren 2020-01-16 19:06:58 -08:00
• b4be6fa161 Updating changelog [ci skip] Jrnl Bot 2020-01-17 03:03:35 +00:00
• c5ff25c7d5
  Merge pull request #809 from aureooms/patch-1 Jonathan Wren 2020-01-16 18:54:18 -08:00
• 8ed1ca86f0
  Merge pull request #792 from micahellison/790-file-locking-windows Jonathan Wren 2020-01-16 18:52:22 -08:00
• 2433363ca8
  Explain how fish can be configured to exclude jrnl commands from history by default #809 Aurélien Ooms 2020-01-16 14:51:22 +01:00
• fd591b82a3
  unpin poetry version in requirments #808 Jonathan Wren 2020-01-14 22:58:36 -08:00
• b522f761ee Updating changelog [ci skip] Jrnl Bot 2020-01-15 06:33:18 +00:00
• 284db07a05 Updating changelog [ci skip] Jrnl Bot 2020-01-15 06:16:04 +00:00
• e8981a6396
  Merge pull request #807 from wren/auto-changelog-724 micahellison 2020-01-14 22:04:52 -08:00
• 43ff998ca3 Updating changelog [ci skip] Jrnl Bot 2020-01-15 05:57:01 +00:00
• af970cd47f
  small fixes for travis pipeline #807 Jonathan Wren 2020-01-14 21:48:42 -08:00
• c68cbaa0b7
  Merge pull request #806 from wren/auto-changelog-724 micahellison 2020-01-14 21:44:58 -08:00
• 4977924977
  update deploy stage condition #806 Jonathan Wren 2020-01-14 21:36:58 -08:00
• 4d70c46b63
  update changelog script to handle different scenarios (#724) Jonathan Wren 2020-01-14 21:31:04 -08:00
• 778a37cd5e
  add script to generate changelog Jonathan Wren 2020-01-14 20:06:14 -08:00
• 7fba6c77a4
  fix conditional for deploy step Jonathan Wren 2020-01-14 19:44:26 -08:00
• 0c87ae52fb
  testing #805 Jonathan Wren 2020-01-14 18:59:52 -08:00
• 3d118c9368
  testing #804 Jonathan Wren 2020-01-14 18:54:25 -08:00
• 6c61382e93
  testing travis #803 Jonathan Wren 2020-01-14 18:48:17 -08:00
• 1d971b0c71
  testing #802 Jonathan Wren 2020-01-14 18:45:07 -08:00
• 8ecc2baa9c
  update changelog generator settings to be less verbose, fix links #801 Jonathan Wren 2020-01-13 20:47:55 -08:00
• f564c8ca34
  use api token instead of username and pw for pypi Jonathan Wren 2020-01-13 20:45:56 -08:00
• 334c9b3e7a
  add config file for changelog generator Jonathan Wren 2020-01-13 20:09:28 -08:00
• 8eb0737e93
  Merge pull request #797 from wren/changelog-update-724 Jonathan Wren 2020-01-12 20:37:07 -08:00
• 59d865134a
  Update changelog in prep for auto changelog generator (#724) #797 Jonathan Wren 2020-01-11 21:20:14 -08:00
• 2bafc8023b Fix for upgrade with missing journal dbxnr 2020-01-10 19:19:22 +00:00
• 79142bf651 Fix for tests not handling multiple input prompts #795 dbxnr 2020-01-10 19:18:25 +00:00
• 97ec922637 black formatting dbxnr 2020-01-10 04:59:12 +00:00
• 08ff1065ae Deployed 9d9f61a with MkDocs version: 1.0.4 Micah Ellison 2020-01-09 20:52:46 -08:00
• 41c4c241cc #790 - closing temp file before passing it to editor to prevent file locking issues in Windows #792 Micah Ellison 2020-01-09 20:34:38 -08:00
• 65eb1bb51b upgrade_config checks for nested changes dbxnr 2020-01-10 01:53:55 +00:00
• ef18cb4144
  Fix for unhandled exception #789 dbxnr 2020-01-09 18:20:48 +00:00
• 7d3895b7d2 Fix file location #786 MinchinWeb 2020-01-04 22:19:56 -07:00
• 50c13478e0 [Travis-CI] add "tree" command to debug missing files MinchinWeb 2020-01-04 22:16:27 -07:00
• baeb8c143c Deal with empty bodies MinchinWeb 2020-01-04 21:57:37 -07:00
• 0c0049166f Reproduce bug in #780 MinchinWeb 2020-01-04 21:54:21 -07:00
• 1c65952770 [DayOne] re-enable tests that were failing on Travis MinchinWeb 2020-01-04 21:26:39 -07:00
• 45290136fc [Dayone] don't break if the system timezone is UTC MinchinWeb 2019-08-01 22:19:00 -06:00
• 31a040878c Code fixes as per review #773 MinchinWeb 2020-01-04 21:02:27 -07:00
• 9d9f61ac1e
  Merge pull request #772 from wren/windows-tests-766 micahellison 2020-01-04 14:27:42 -08:00
• 6fc1313b47
  skip more windows tests #772 Jonathan Wren 2020-01-04 13:49:05 -08:00
• a3e24bcc9f
  run black Jonathan Wren 2020-01-04 13:42:25 -08:00
• 549d771956
  skip another windows test Jonathan Wren 2020-01-04 13:37:50 -08:00
• 3f8133cda5
  whitespace changes Jonathan Wren 2020-01-04 13:24:07 -08:00
• efa21831ed
  skip another windows test Jonathan Wren 2020-01-04 13:23:57 -08:00
• 2d92201157
  remove broken test (windows can't handle emoji) Jonathan Wren 2020-01-04 13:02:15 -08:00
• 5434d476de
  [#766] Skip another broken windows test Jonathan Wren 2019-12-10 22:51:56 -08:00
• 686ccaae3b
  [#766] Skip the broken test on windows for now Jonathan Wren 2019-12-10 22:05:38 -08:00
• 0f53329592
  Merge pull request #774 from eshrh/fix-usage-notes micahellison 2020-01-04 12:44:47 -08:00
• a5d2e1625c
  Merge pull request #782 from markphelps/patch-1 Jonathan Wren 2020-01-04 12:42:13 -08:00
• 82c69d0053
  Merge pull request #784 from wren/build-fix-black Jonathan Wren 2020-01-04 12:38:21 -08:00
• 676cac7e80
  Change stage so travis doesn't get confused about allowed failures #784 Jonathan Wren 2020-01-04 12:29:31 -08:00
• 06970f3911
  run black to get codebase into good base state Jonathan Wren 2020-01-04 12:12:00 -08:00
• e2ce40424e
  clarify build steps Jonathan Wren 2020-01-04 12:08:38 -08:00
• 8384b799a1
  update lock file Jonathan Wren 2020-01-04 12:01:51 -08:00
• 31138c0463
  update black version Jonathan Wren 2020-01-04 12:01:21 -08:00
• 6d8b5a59b3
  Remove merge marker in recipes.md #782 Mark Phelps 2020-01-04 11:58:49 -05:00
• a86e15b1aa
  Merge branch 'develop' into dayone-yaml-export MinchinWeb 2019-12-24 10:37:37 -07:00
• 2e920a7e8f
  Merge pull request #769 from MinchinWeb/black Jonathan Wren 2019-12-21 12:57:32 -08:00
• e984a9a015
  Merge branch 'develop' into black #769 Jonathan Wren 2019-12-21 12:11:05 -08:00
• 717078bcfc
  Merge pull request #778 from wren/black-format-770 micahellison 2019-12-21 12:00:36 -08:00
• 07a633ae51
  (#770) run black formatter on codebase for standardization #778 Jonathan Wren 2019-12-21 11:47:02 -08:00
• c30cfbcf04
  Update recipes.md #777 Jordan R. III 2019-12-19 17:24:05 -05:00
• 2291859634
  Update environment.py Aaron Lichtman 2019-12-16 04:38:00 +01:00
• 313651af11
  Merge branch 'master' into interactive_delete Aaron Lichtman 2019-12-16 04:33:52 +01:00
• 411a790f29
  Fix usage notes #774 Eshan 2019-12-15 00:04:42 -05:00
• f568df86e4 [Black] apply black formatter to YAML Exporter MinchinWeb 2019-12-14 15:23:18 -07:00
• 1ac96ae698 [YAML Exporter] switch to f-strings MinchinWeb 2019-12-14 15:22:12 -07:00
• 2704ad32c2 [Dayone] Brings back extended Dayone attributes to YAML export c.f. 7d3afd811b reverse fd46ffea23 MinchinWeb 2019-12-14 15:00:20 -07:00
• 5adf0aee05 [YAML Export] code style improvements MinchinWeb 2015-05-11 11:55:46 -06:00
• c8172efdcc [Travis] black -- show a diff on things that need to be reformatted MinchinWeb 2019-12-14 14:00:28 -07:00
• e7cbbecaef [Black] sync to develop branch and apply black MinchinWeb 2019-12-14 13:35:42 -07:00
• 9d183229df [Travis] update as per code review MinchinWeb 2019-12-12 10:41:08 -07:00
• a9e4e09547
  Merge pull request #708 from pspeter/simplify-password-logic Jonathan Wren 2019-12-10 21:04:59 -08:00
• f5e47f6484
  Merge pull request #719 from maebert/maebert-fast-import Jonathan Wren 2019-12-10 20:58:56 -08:00
• 6a8f3edec1
  Merge branch 'develop' into maebert-fast-import #719 Jonathan Wren 2019-12-10 20:47:39 -08:00
• cb9d546141
  Merge pull request #740 from empireshades/master Jonathan Wren 2019-12-10 20:25:36 -08:00
• c1defc7db1 [Travis] add a linting stage (via black) MinchinWeb 2019-12-07 12:45:28 -07:00
• d8f422151d Apply black formatter to code MinchinWeb 2019-12-07 12:32:55 -07:00
• a1d3577e3f
  Merge pull request #767 from thejspr/patch-1 Jonathan Wren 2019-12-03 08:11:29 -08:00
• 8407ec5fb0
  Fix merge conflict left-over #767 Jesper Kjeldgaard 2019-12-03 11:59:05 +01:00
• 9b6b788af4 Renamed searching to contains. Made changes as per pull-request: https://github.com/jrnl-org/jrnl/pull/740 #740 Jims 2019-12-01 23:03:38 -05:00
• 45384f3c8f Use __version__.py instead of VERSION.txt Manuel Ebert 2019-12-01 19:41:16 -08:00
• 34b07d3686
  Merge pull request #765 from wren/python-38-739 micahellison 2019-11-30 13:55:17 -08:00
• 3717c26559 [#739] Update tests so that 3.8 is not an allowed failure #765 Jonathan Wren 2019-11-30 13:36:50 -08:00
• 7200b1fa77 [#739][#747] update lock file Jonathan Wren 2019-11-30 13:35:59 -08:00
• af228fd163 Merge branch 'master' into develop Jonathan Wren 2019-11-30 13:15:07 -08:00
• 864df05cc1
  Merge pull request #761 from wren/travis-double-deploy-757 micahellison 2019-11-30 12:41:42 -08:00
• 562454427e Incrementing version to v2.1.1 Jrnl Bot 2019-11-30 20:32:11 +00:00
• 8a2af55fa8 Deployed 7e373bb with MkDocs version: 1.0.4 Micah Ellison 2019-11-30 12:08:58 -08:00
• 7e373bb385
  Merge pull request #763 from maebert/mobile-header Jonathan Wren 2019-11-30 10:46:52 -08:00
• a5b5f4732a [#757] update mac python version test to match others #761 Jonathan Wren 2019-11-29 22:04:02 -08:00