Commit graph

fz0x1/jrnl

Fork 0

mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-17 19: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

f43b643406 Refactor YAML exporter to be Pelican Markdown exporter MinchinWeb 2021-09-11 10:24:03 -06:00
dc30527b4b Remove markdown-include now that it is not being used #1265 Micah Jerome Ellison 2021-07-17 15:41:04 -07:00
e6250c3e5a Move Plugins down to the end Micah Jerome Ellison 2021-06-19 16:07:13 -07:00
d7e1378b90 Reference sample code instead of embedding big files. Also paring down markdown line length Micah Jerome Ellison 2021-06-19 14:41:37 -07:00
4d59ef688c First pass at editing feature plugin docs Micah Jerome Ellison 2021-06-19 14:05:54 -07:00
51735da1be Begin migrating/rewording --cf tests in pytest-bdd. Micah Jerome Ellison 2021-09-06 14:03:59 -07:00
6f6ee7b54f Update changelog [ci skip] Jrnl Bot 2021-09-06 19:57:05 +00:00
087b038d77

Bump black from 21.7b0 to 21.8b0 (#1333) dependabot[bot] 2021-09-06 12:55:29 -07:00
73145888e6 Update changelog [ci skip] Jrnl Bot 2021-09-06 19:55:02 +00:00
3615abd4e2

Bump pytest from 6.2.4 to 6.2.5 (#1334) dependabot[bot] 2021-09-06 12:53:18 -07:00
72f2d14427 Update changelog [ci skip] Jrnl Bot 2021-09-06 19:44:30 +00:00
8ccaf4ac1d Increment version to v2.8.3 v2.8.3 Jrnl Bot 2021-09-06 19:43:07 +00:00
ff1b70b5e8

Bump pytest from 6.2.4 to 6.2.5 #1334 dependabot[bot] 2021-08-31 00:07:28 +00:00
a514c07d72

Bump black from 21.7b0 to 21.8b0 #1333 dependabot[bot] 2021-08-30 00:33:45 +00:00
778c1de6eb Update changelog [ci skip] Jrnl Bot 2021-08-28 23:00:37 +00:00
a32aefe541 Increment version to v2.8.3-beta v2.8.3-beta Jrnl Bot 2021-08-28 22:58:59 +00:00
3f8f14cf8f Include new journal types docs section in site nav Micah Jerome Ellison 2021-08-28 13:32:17 -07:00
d2645ca813 Add docs section for journal types Micah Jerome Ellison 2021-08-28 13:31:22 -07:00
3c561af93d Update changelog [ci skip] Jrnl Bot 2021-08-28 20:22:11 +00:00
7eaeef821e

Bump cryptography from 3.4.7 to 3.4.8 (#1329) dependabot[bot] 2021-08-28 13:20:25 -07:00
7030185e4f Update changelog [ci skip] Jrnl Bot 2021-08-28 20:20:16 +00:00
5abf974682

Fix deletion of entries on folder journal through --delete flag (#1328) Micah Jerome Ellison 2021-08-28 13:18:34 -07:00
db5777ba0b

Bump cryptography from 3.4.7 to 3.4.8 #1329 dependabot[bot] 2021-08-25 00:10:58 +00:00
adc0c57a83 Fix folder journal deletion by tracking which dates are associated with deleted entries #1328 Micah Jerome Ellison 2021-08-21 15:07:11 -07:00
cd92a98335 Disable dayone tests again - out of scope for this problem Micah Jerome Ellison 2021-08-21 15:06:36 -07:00
0ee8179103 Re-enable failing folder/DayOne tests Micah Jerome Ellison 2021-08-21 14:54:42 -07:00
fa146b1434

Warn when DayOne/directory journals have encrypt: true in config (#1325) Micah Jerome Ellison 2021-08-21 14:47:49 -07:00
c52e878c01 Update changelog [ci skip] Jrnl Bot 2021-08-21 21:44:38 +00:00
050c17ee06

Allow emoji in config file in Windows by always opening it as unicode (#1313) Micah Jerome Ellison 2021-08-21 14:43:11 -07:00
7109374d42

Fix failure to import into directory journal (#1314) Micah Jerome Ellison 2021-08-21 14:42:31 -07:00
08350b884b

take out redundant lines from PR template (#1327) Jonathan Wren 2021-08-21 14:00:31 -07:00
248c6ddf2a Merge branch 'develop' into directory-journal-config-encrypt #1314 Micah Jerome Ellison 2021-08-21 13:51:14 -07:00
ec089c464c Merge branch 'develop' into directory-journal-config-encrypt #1325 Micah Jerome Ellison 2021-08-21 13:49:06 -07:00
1ae8c693d5 take out redundant lines from PR template #1327 Jonathan Wren 2021-08-21 13:48:28 -07:00
bacbf8109b Update changelog [ci skip] Jrnl Bot 2021-08-21 20:48:08 +00:00
3e5a55b1e9

Display error when trying to encrypt folder/DayOne journal types (#1315) Micah Jerome Ellison 2021-08-21 13:46:29 -07:00
55097ab61f Warn when encrypt is true and journal type is directory/DayOne Micah Jerome Ellison 2021-08-21 13:19:49 -07:00
6561b50311 Merge branch 'folder-journal-exception' into directory-journal-config-encrypt Micah Jerome Ellison 2021-08-21 13:10:06 -07:00
3e801f1b10 Add failing test for new error message about unencryptable journals Micah Jerome Ellison 2021-08-21 12:59:37 -07:00
25513e7db4 Consolidate and standardized tests #1315 Micah Jerome Ellison 2021-08-21 12:41:54 -07:00
7a1cf85720 Add test to ensure this doesn't mess with encrypting normal journals Micah Jerome Ellison 2021-08-21 12:30:57 -07:00
6648fdc1e3

Bump tzlocal from 2.1 to 3.0 #1319 dependabot[bot] 2021-08-21 19:12:46 +00:00
9de723d014 Update changelog [ci skip] Jrnl Bot 2021-08-21 19:10:25 +00:00
9c32d3b25c Merge branch 'develop' into journal-emoji-name-windows #1313 Micah Jerome Ellison 2021-08-21 12:10:22 -07:00
4b611c8561 Merge branch 'develop' into directory-journal-import Micah Jerome Ellison 2021-08-21 12:10:14 -07:00
88978b6470 Merge branch 'develop' into folder-journal-exception Micah Jerome Ellison 2021-08-21 12:09:42 -07:00
a0a3ef669e

Set bash as default shell (#1324) Micah Jerome Ellison 2021-08-21 12:08:44 -07:00
141cf2445f Set bash as default shell #1324 Micah Jerome Ellison 2021-08-21 11:44:14 -07:00
1c63d94736 Update changelog [ci skip] Jrnl Bot 2021-08-17 03:24:18 +00:00
32b5a2b5d0

Bump keyring from 23.0.1 to 23.1.0 (#1318) dependabot[bot] 2021-08-16 20:22:39 -07:00
3b93e92960

take out arg for old plugin from makefile (#1322) Jonathan Wren 2021-08-16 20:13:44 -07:00
b22417d179 Change negative bool name to a positive Micah Jerome Ellison 2021-08-16 20:06:12 -07:00
3a3abcc939 take out arg for old plugin from makefile #1322 Jonathan Wren 2021-08-16 20:05:15 -07:00
7235cd7348

Bump keyring from 23.0.1 to 23.1.0 #1318 dependabot[bot] 2021-08-17 02:53:36 +00:00
30c1ecbd46 Merge branch 'develop' into folder-journal-exception Micah Jerome Ellison 2021-08-16 19:51:28 -07:00
6bcbe3b1e0 Merge branch 'develop' into journal-emoji-name-windows Micah Jerome Ellison 2021-08-16 19:51:06 -07:00
678dfa3345 Merge branch 'develop' into directory-journal-import Micah Jerome Ellison 2021-08-16 19:50:41 -07:00
5ec7dec9f0 Update changelog [ci skip] Jrnl Bot 2021-08-17 02:47:47 +00:00
8a64b77e63

Update build to poetry alpha 2 for python 3.10 (#1320) Jonathan Wren 2021-08-16 19:46:01 -07:00
11fe6c19b8 update testing workflow to run when workflow itself is changed #1320 Jonathan Wren 2021-08-16 19:40:21 -07:00
c0e068d693 udpate build to poetry alpha 2 for python 3.10 Jonathan Wren 2021-08-16 19:35:37 -07:00
abab1852fd Raise exception when trying to commit folder-based journal (including DayOne) Micah Jerome Ellison 2021-07-31 16:58:22 -07:00
58b3e3488f Run make format Micah Jerome Ellison 2021-07-31 16:12:41 -07:00
076674f993 Appropriately track journal name and modified entries in FolderJournal when importing Micah Jerome Ellison 2021-07-31 16:00:48 -07:00
7cdba42dbc Re-enable failing directory journal import tests Micah Jerome Ellison 2021-07-31 14:05:44 -07:00
ed015526f4 Add test for journal with emoji name Micah Jerome Ellison 2021-07-31 13:42:20 -07:00
85ee9ba9ed Open config file as utf-8 always Micah Jerome Ellison 2021-07-31 13:18:37 -07:00
b23c831da5 Update changelog [ci skip] Jrnl Bot 2021-07-31 19:11:33 +00:00
eaaa7bb0e1 Increment version to v2.8.2 v2.8.2 Jrnl Bot 2021-07-31 19:10:05 +00:00
c49853d724 Update changelog [ci skip] Jrnl Bot 2021-07-31 18:47:00 +00:00
642155292a

Bump mkdocs from 1.2.1 to 1.2.2 (#1307) dependabot[bot] 2021-07-31 11:45:19 -07:00
c9c6e7efc1

Fix typo in --help (#1309) Micah Jerome Ellison 2021-07-31 11:43:19 -07:00
fcd06ef09f Fix typo in args doc #1309 Micah Jerome Ellison 2021-07-25 15:58:44 -07:00
b197b7e790

Bump mkdocs from 1.2.1 to 1.2.2 #1307 dependabot[bot] 2021-07-19 01:05:57 +00:00
1ba1b756c9 Update changelog [ci skip] Jrnl Bot 2021-07-17 22:17:56 +00:00
f158d7f266 Increment version to v2.8.2-beta v2.8.2-beta Jrnl Bot 2021-07-17 22:16:08 +00:00
79c37401c4 jrnl.__version__ magic works! (#1296) MinchinWeb 2021-07-17 14:19:48 -06:00
6b1d6ccd56 Fix testing for plugins (#1277) Jonathan Wren 2021-07-03 16:10:07 -07:00
4a9f01abb1 Restore __main__.py functionality (#1278) MinchinWeb 2021-06-26 23:55:17 -06:00
be1da17ab9 Remove __init__.py files (#1275) Jonathan Wren 2021-06-26 14:54:26 -07:00
4392e29742 Use implicit namespace plugins for import and export (#1216) MinchinWeb 2021-05-29 18:21:45 -06:00
15786dfc11 Fix behave test that was being missed due to "Outline" keyword; also adding in appropriate parameters and no error step #1281 Micah Jerome Ellison 2021-07-17 14:07:30 -07:00
686c256bd5

Merge pull request #2 from samuelgregorovic/develop samuelgregorovic 2021-07-17 22:56:29 +02:00
7f5fbca658 Sample Importer: Handle data consistently whether from file or stdin MinchinWeb 2021-06-26 22:09:46 -06:00
a0506c06bf Merge branch 'develop' into contributing-doc-site Micah Jerome Ellison 2021-07-17 13:24:40 -07:00
cef3a98b4e Update changelog [ci skip] Jrnl Bot 2021-07-17 20:23:48 +00:00
31f782e333

Add documentation about saved passwords in Windows (#1301) Micah Jerome Ellison 2021-07-17 13:22:01 -07:00
4607d41ebc escape strings in workflow #1296 Jonathan Wren 2021-07-17 12:31:41 -07:00
a79a3cb723 jrnl.__version__ magic works! MinchinWeb 2021-07-08 22:24:20 -06:00
e6a6b13cfb Add missing yq dep back in to allow xq to run in mkdocs CI pipeline #1301 Micah Jerome Ellison 2021-07-17 13:06:59 -07:00
183795d3f5 Fix testing for plugins (#1277) Jonathan Wren 2021-07-03 16:10:07 -07:00
beb6108b11 Restore __main__.py functionality (#1278) MinchinWeb 2021-06-26 23:55:17 -06:00
c5c859d8de Remove __init__.py files (#1275) Jonathan Wren 2021-06-26 14:54:26 -07:00
2cb5eec09c Use implicit namespace plugins for import and export (#1216) MinchinWeb 2021-05-29 18:21:45 -06:00
3e95a46bd2 Update changelog [ci skip] Jrnl Bot 2021-07-17 19:15:00 +00:00
52c0a0ebf3

Bump python-dateutil from 2.8.1 to 2.8.2 (#1302) dependabot[bot] 2021-07-17 12:13:19 -07:00
f7d82b5b23 Merge branch 'develop' into credential-manager-warning Micah Jerome Ellison 2021-07-17 12:04:02 -07:00
b896c85bf0 Update changelog [ci skip] Jrnl Bot 2021-07-17 19:03:29 +00:00
7b72b24ee2

Add first draft of security.md (#1299) Micah Jerome Ellison 2021-07-17 12:01:59 -07:00
85e5224be9

Bump python-dateutil from 2.8.1 to 2.8.2 #1302 dependabot[bot] 2021-07-15 00:09:59 +00:00