Commit graph

fz0x1/jrnl

Fork 0

mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-19 20:48:31 +02:00

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

#1011

#1012

#1016

#1018

#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

#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

#1220

#1221

#1222

#1223

#1228

#1229

#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

#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

#1680

#1684

#1685

#1686

#1687

#1690

#1691

#1693

#1695

#1697

#1698

#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

#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

#1872

#1873

#1874

#1876

#1878

#188

#1880

#1884

#1889

#1890

#1892

#1895

#1896

#1897

#1898

#1899

#19

#1900

#1904

#1914

#1918

#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

#1966

#1967

#1970

#1971

#1972

#1973

#1974

#1978

#198

#1980

#1981

#1982

#1983

#1984

#1986

#1988

#1989

#1991

#1993

#1994

#1995

#1998

#20

#200

#2000

#2001

#204

#206

#209

#211

#213

#217

#218

#219

#225

#226

#232

#235

#239

#24

#247

#248

#251

#252

#253

#255

#258

#26

#261

#267

#278

#280

#283

#289

#292

#294

#298

#299

#30

#300

#301

#304

#305

#306

#309

#310

#313

#314

#319

#320

#321

#323

#325

#326

#33

#331

#336

#34

#341

#342

#346

#347

#349

#350

#355

#357

#359

#370

#375

#376

#377

#378

#381

#387

#39

#393

#397

#399

#400

#403

#405

#416

#417

#418

#419

#42

#420

#423

#425

#43

#430

#431

#435

#44

#442

#447

#448

#457

#458

#464

#469

#470

#471

#474

#476

#477

#49

#492

#495

#498

#499

#500

#501

#506

#509

#51

#515

#516

#517

#518

#525

#526

#527

#531

#54

#542

#543

#544

#545

#550

#553

#554

#555

#556

#56

#561

#563

#564

#571

#58

#583

#585

#59

#592

#595

#596

#599

#601

#603

#604

#606

#608

#609

#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

#650

#655

#657

#66

#660

#665

#670

#672

#679

#682

#683

#684

#688

#692

#694

#695

#697

#698

#699

#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

#801

#802

#803

#804

#805

#806

#807

#808

#809

#812

#819

#82

#820

#822

#823

#824

#826

#829

#83

#830

#833

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#85

#850

#852

#854

#857

#86

#868

#869

#871

#872

#879

#88

#885

#886

#887

#895

#897

#898

#90

#900

#902

#904

#905

#907

#908

#909

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#923

#924

#925

#927

#928

#933

#934

#935

#936

#937

#938

#94

#940

#941

#942

#944

#947

#948

#951

#952

#953

#954

#956

#957

#958

#959

#961

#963

#964

#965

#969

#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

c480368a87 Deploy jrnl-org/jrnl to github.com/jrnl-org/jrnl.git:gh-pages Deployment Bot (from Travis CI) 2019-10-19 21:43:26 +00:00
50c1b86d21 Merge pull request #684 from wren/deployment-testing Micah Jerome Ellison 2019-10-19 14:41:51 -07:00
6d699fc240

Merge pull request #684 from wren/deployment-testing micahellison 2019-10-19 14:41:51 -07:00
a25d816fa1 [#681] Separate local dev from pipeline releases Jonathan Wren 2019-10-19 14:36:12 -07:00
eca300551d [#681] Separate local dev from pipeline releases #684 Jonathan Wren 2019-10-19 14:36:12 -07:00
81c7833f1d Merge pull request #683 from wren/deployment-testing Micah Jerome Ellison 2019-10-19 13:53:58 -07:00
8433ade514

Merge pull request #683 from wren/deployment-testing micahellison 2019-10-19 13:53:58 -07:00
0f59c41712 [#681] Appease the poetry gods Jonathan Wren 2019-10-19 13:50:52 -07:00
675ef51ca1 [#681] Appease the poetry gods #683 Jonathan Wren 2019-10-19 13:50:52 -07:00
1840132b76 [#681] Update version handling in source and travis deployments Jonathan Wren 2019-10-19 13:41:59 -07:00
caeafb38a7 [#681] Update version handling in source and travis deployments Jonathan Wren 2019-10-19 13:41:59 -07:00
631eb32418 Merge pull request #682 from wren/deployment-testing Micah Jerome Ellison 2019-10-19 13:09:57 -07:00
47357492a4

Merge pull request #682 from wren/deployment-testing micahellison 2019-10-19 13:09:57 -07:00
27db5e520f ¯\_(ツ)_/¯ Jonathan Wren 2019-10-19 13:03:57 -07:00
b4fda4d4c5 ¯\_(ツ)_/¯ #682 Jonathan Wren 2019-10-19 13:03:57 -07:00
256a0b1e27

Merge branch 'master' into micah-docs-666 #672 micahellison 2019-10-05 16:58:19 -07:00
367766c574 Merge pull request #670 from jrnl-org/v2.1 Micah Jerome Ellison 2019-10-05 16:30:03 -07:00
350f0a1618

Merge pull request #670 from jrnl-org/v2.1 micahellison 2019-10-05 16:30:03 -07:00
c97e782904 remove faulty conditional Jonathan Wren 2019-10-05 16:27:18 -07:00
ee5d450cbe remove faulty conditional #670 Jonathan Wren 2019-10-05 16:27:18 -07:00
ff1a8bf6e9 update makefile to use poetry for more things Jonathan Wren 2019-10-05 16:07:34 -07:00
0328a748d3 update makefile to use poetry for more things Jonathan Wren 2019-10-05 16:07:34 -07:00
69995836ac update version and author emails Jonathan Wren 2019-10-05 16:06:16 -07:00
9e0ed53643 update version and author emails Jonathan Wren 2019-10-05 16:06:16 -07:00
912653cd10 Merge branch 'pr/merge-v2.1' Jonathan Wren 2019-10-05 16:00:52 -07:00
f9e746fe24 Merge branch 'pr/merge-v2.1' Jonathan Wren 2019-10-05 16:00:52 -07:00
9881e872c5 update requirements to include pyyaml >= 5.1 Jonathan Wren 2019-10-05 15:59:39 -07:00
a5519b9804 update requirements to include pyyaml >= 5.1 Jonathan Wren 2019-10-05 15:59:39 -07:00
f1cfb48240 [GH-666] updating documentation to reflect v2 behavior: Micah Ellison 2019-10-05 15:50:04 -07:00
3dea7d936f

Merge branch 'master' into 2.0-dayone-fixes #350 MinchinWeb 2019-10-01 19:16:32 -06:00
47e10fbee7 Fix issue #662 to properly handle day names as new entry dates and command line (-on, -from, -to). #665 Craig Moyer 2019-09-29 19:06:53 -04:00
9588913100 Syncing with jrnl-org/master Craig Moyer 2019-09-29 08:27:27 -04:00
4c68eb193d Merge remote-tracking branch 'upstream/master' into 2.0-rc1-maebert Craig Moyer 2019-09-29 07:52:02 -04:00
59df56d887 Merge pull request #660 from etnnth/yaml-version Jonathan Wren 2019-09-25 17:13:01 -07:00
1bbf074fe9

Merge pull request #660 from etnnth/yaml-version Jonathan Wren 2019-09-25 17:13:01 -07:00
57123d1a9f Change pyYAML required version Full Loader only avalaible from v5.1: etienne 2019-09-24 17:13:05 +02:00
9bc0340280 Change pyYAML required version Full Loader only avalaible from v5.1: #660 etienne 2019-09-24 17:13:05 +02:00
866634035a Fix failed test scenarios for folder journal. #458 Craig Moyer 2019-09-23 17:20:07 -04:00
f4e40fc43d

Merge branch 'master' into issue-170 notbalanced 2019-09-22 20:50:34 -04:00
60b004b25f Merge pull request #655 from jrnl-org/manu--contributing Jonathan Wren 2019-09-21 12:38:23 -07:00
b1680fd90b

Merge pull request #655 from jrnl-org/manu--contributing Jonathan Wren 2019-09-21 12:38:23 -07:00
6b2596c2de Merge pull request #637 from jprof/add-not-flag Jonathan Wren 2019-09-21 12:37:34 -07:00
b8a2c2df9d

Merge pull request #637 from jprof/add-not-flag Jonathan Wren 2019-09-21 12:37:34 -07:00
50608b2758 Merge pull request #550 from silenc3r/master Jonathan Wren 2019-09-21 12:36:49 -07:00
20916eab54

Merge pull request #550 from silenc3r/master Jonathan Wren 2019-09-21 12:36:49 -07:00
64837b8cc1 Merge pull request #657 from jrnl-org/v2.0.1 Micah Jerome Ellison 2019-09-21 12:13:44 -07:00
fe48a928d8

Merge pull request #657 from jrnl-org/v2.0.1 micahellison 2019-09-21 12:13:44 -07:00
d4d0b7c27c Fix references to Sphinx in contributing.md Manuel Ebert 2019-09-18 10:33:01 -07:00
f9ff519679 Fix references to Sphinx in contributing.md #655 Manuel Ebert 2019-09-18 10:33:01 -07:00
4542dadf27 Merge pull request #650 from micahellison/632-upgrade-tests Jonathan Wren 2019-08-24 15:51:00 -07:00
2767567dc1

Merge pull request #650 from micahellison/632-upgrade-tests Jonathan Wren 2019-08-24 15:51:00 -07:00
c4a102f037 Merge pull request #649 from jrnl-org/manu--docs Jonathan Wren 2019-08-24 15:48:19 -07:00
542f23a180

Merge pull request #649 from jrnl-org/manu--docs Jonathan Wren 2019-08-24 15:48:19 -07:00
aa0332c2a7 [GH-632] adding call to action to report issue when upgrade fails Micah Jerome Ellison 2019-08-24 15:47:13 -07:00
be35904912 [GH-632] adding call to action to report issue when upgrade fails #650 Micah Jerome Ellison 2019-08-24 15:47:13 -07:00
4ff867ee5e [GH-632] removing unreachable return statement Micah Jerome Ellison 2019-08-24 15:25:05 -07:00
244165664b [GH-632] removing unreachable return statement Micah Jerome Ellison 2019-08-24 15:25:05 -07:00
261e22b6e0 [GH-632] removing unnecessary whitespace Micah Jerome Ellison 2019-08-24 15:14:15 -07:00
4d0640e613 [GH-632] removing unnecessary whitespace Micah Jerome Ellison 2019-08-24 15:14:15 -07:00
b13a411e6f [GH-632] raising exception in upgrade.py on fail Micah Jerome Ellison 2019-08-24 15:01:23 -07:00
a4e881942a [GH-632] raising exception in upgrade.py on fail Micah Jerome Ellison 2019-08-24 15:01:23 -07:00
12c474ecd8 [GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not Micah Jerome Ellison 2019-08-24 13:50:10 -07:00
3bfd9f487b [GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not Micah Jerome Ellison 2019-08-24 13:50:10 -07:00
6127170c88 Found and removed another angsty teenager Manuel Ebert 2019-08-23 18:39:49 -07:00
47117b4ef5 Found and removed another angsty teenager #649 Manuel Ebert 2019-08-23 18:39:49 -07:00
c09d71ad2f Smaller doc fixes, fixes #486 Manuel Ebert 2019-08-23 18:38:05 -07:00
2c99441803 Smaller doc fixes, fixes #486 Manuel Ebert 2019-08-23 18:38:05 -07:00
4f489de3bb In Encryption docs, improve grammar and typography #492 Rory O’Kane 2019-08-19 04:01:33 -04:00
dbe8ac310f In Encryption docs, explain how to prevent Fish history logging Rory O’Kane 2019-08-19 03:50:41 -04:00
8b4e84c914 Merge pull request #639 from MinchinWeb/export-md-headers Jonathan Wren 2019-08-15 18:45:23 -07:00
6d3c35b2f7

Merge pull request #639 from MinchinWeb/export-md-headers #657 Jonathan Wren 2019-08-15 18:45:23 -07:00
51f5ef54aa Merge pull request #612 from jrnl-org/manu--poetry Jonathan Wren 2019-08-15 17:50:15 -07:00
4c516a83b8

Merge pull request #612 from jrnl-org/manu--poetry Jonathan Wren 2019-08-15 17:50:15 -07:00
06a106312f Add deployment through poetry to travis Manuel Ebert 2019-07-07 20:41:31 -07:00
6a717029a7 Add deployment through poetry to travis #612 Manuel Ebert 2019-07-07 20:41:31 -07:00
d51225da0f Add Poetry config Manuel Ebert 2019-07-07 20:41:18 -07:00
9d40f867b7 Add Poetry config Manuel Ebert 2019-07-07 20:41:18 -07:00
d29b9c82a9 Merge pull request #641 from gregorybodnar/create_encrypted_journal Micah Jerome Ellison 2019-08-13 12:17:12 -07:00
ec1b2c63b9

Merge pull request #641 from gregorybodnar/create_encrypted_journal micahellison 2019-08-13 12:17:12 -07:00
4ad3eb14d6 Merge pull request #644 from wren/escape-dates-GH-631 Micah Jerome Ellison 2019-08-13 12:16:08 -07:00
a6044b65bc

Merge pull request #644 from wren/escape-dates-GH-631 micahellison 2019-08-13 12:16:08 -07:00
71ba5dd6db Merge pull request #646 from wren/stalebot-60 Micah Jerome Ellison 2019-08-10 16:49:17 -07:00
945a18ac7d

Merge pull request #646 from wren/stalebot-60 micahellison 2019-08-10 16:49:17 -07:00
a1a8e02c13 change pinned label to a super cool emoji ⭐️ Jonathan Wren 2019-08-10 16:45:54 -07:00
8fe8f9d5c9 change pinned label to a super cool emoji ⭐️ #646 Jonathan Wren 2019-08-10 16:45:54 -07:00
096f68d87f Merge pull request #645 from wren/stalebot-60 Micah Jerome Ellison 2019-08-10 16:35:21 -07:00
c09ac67d9c

Merge pull request #645 from wren/stalebot-60 micahellison 2019-08-10 16:35:21 -07:00
a1b0f0c9ff move stablebot back up to 60 days now that backlog is a bit more cleared out Jonathan Wren 2019-08-10 16:21:38 -07:00
d9d83447d0 move stablebot back up to 60 days now that backlog is a bit more cleared out #645 Jonathan Wren 2019-08-10 16:21:38 -07:00
ca25471ff1 #631 Escape data in square brackets Jonathan Wren 2019-08-10 13:35:03 -07:00
1350bcad1b #631 Escape data in square brackets #644 Jonathan Wren 2019-08-10 13:35:03 -07:00
a61d9238c4 fix a few linting errors Jonathan Wren 2019-08-10 12:17:36 -07:00
e189ac12fe fix a few linting errors Jonathan Wren 2019-08-10 12:17:36 -07:00
a97e84fe5c Add tests for the excluding tags with -not Justin Proffitt 2019-08-07 20:58:35 -04:00
31a4607a7d Add tests for the excluding tags with -not #637 Justin Proffitt 2019-08-07 20:58:35 -04:00
e9ebaf65c2 Handle KeyboardInterrupt when installing journal Dawid Zych 2019-08-07 19:12:04 +02:00
960573c103 Handle KeyboardInterrupt when installing journal #550 Dawid Zych 2019-08-07 19:12:04 +02:00
432f6ed011

Add doc about extracting timestamps with no spaces #634 Greg Bodnar 2019-08-04 15:26:55 +12:00
442900338a

Add doc about extracting timestamps with no spaces #633 Greg Bodnar 2019-08-04 15:23:33 +12:00
95c743fd05 Use util wrapper for getpass Greg Bodnar 2019-08-04 13:21:40 +12:00