Commit graph

fz0x1/jrnl

Fork 0

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

#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

1cd34167bd

Merge branch 'develop' into change-time-docs #1471 Micah Jerome Ellison 2022-05-07 13:04:59 -07:00
e4b69a1cec Keep mkdocs version under 1.3 both locally and for readthedocs Micah Jerome Ellison 2022-05-07 12:57:06 -07:00
e6ed64ac7a Update changelog [ci skip] Jrnl Bot 2022-05-07 19:21:16 +00:00
8458cdb06f

Fixed -not option with no arguments bug (#1466) Kevin 2022-05-07 12:19:37 -07:00
4dacd86bc3 Update changelog [ci skip] Jrnl Bot 2022-05-07 19:15:14 +00:00
792f188ecc

Give a proper message when trying to use an empty config file (#1461) Jonathan van der Steege 2022-05-07 21:13:36 +02:00
2941b9eb16 Document change-time in command line reference Micah Jerome Ellison 2022-05-07 11:56:02 -07:00
71c1d38d50 Update changelog [ci skip] Jrnl Bot 2022-05-07 18:12:57 +00:00
74200f8dc4

Yaml export errors now don't show stack trace (#1449) Kevin 2022-05-07 11:11:00 -07:00
d7a75e4918 unskip working tests #1449 Jonathan Wren 2022-05-07 10:59:58 -07:00
048c9d40e7 Update changelog [ci skip] Jrnl Bot 2022-05-07 17:51:26 +00:00
41e4b81192

Bump cryptography from 37.0.1 to 37.0.2 (#1467) dependabot[bot] 2022-05-07 10:49:23 -07:00
7f4457dcc8

Bump cryptography from 37.0.1 to 37.0.2 #1467 dependabot[bot] 2022-05-05 00:05:34 +00:00
8da990f602 Fixed -not option with no arguments bug #1466 apainintheneck 2022-05-01 13:33:33 -07:00
a947557514 Merge branch 'develop' of github.com:jonakeys/jrnl_jk into develop #1461 Jonathan van der Steege 2022-05-01 16:42:14 +02:00
ad33adeaa1 bdd-test doesn't add version if file is (and should stay) empty. Jonathan van der Steege 2022-05-01 16:41:43 +02:00
0dd7ec798c Exit program with message if config is empty. Jonathan van der Steege 2022-05-01 16:41:33 +02:00
321ac70d61 Exit program with message if config is empty. bdd-test doesn't add version if file is (and should stay) empty. Jonathan van der Steege 2022-05-01 16:39:35 +02:00
420a9fc999

Merge branch 'jrnl-org:develop' into develop Jonathan van der Steege 2022-05-01 13:43:40 +02:00
d6579d3e7a When using --edit and --change-time, change the time before editing Richard Schneider 2022-04-30 21:52:24 -05:00
5e28a06029 Don't prompt for --change-time when used with --edit and only one entry Richard Schneider 2022-04-30 21:22:33 -05:00
0f791cf69a Add prompt for --change-time Richard Schneider 2022-04-30 21:10:55 -05:00
0e0f167891 Leave partially written to files after export error apainintheneck 2022-04-30 13:12:13 -07:00
d27b95b963 Add test for user-friendly error when exporting YAML to a nonexistent directory Micah Jerome Ellison 2022-04-23 13:37:53 -07:00
691186f3c5 Yaml export errors now don't show stacktrace apainintheneck 2022-04-20 13:25:13 -07:00
6a12853b65 Update changelog [ci skip] Jrnl Bot 2022-04-30 19:41:10 +00:00
d6d6db0aa3

Display "No entry to save, because no text was received" after empty entry on cmdline (#1459) Kevin 2022-04-30 12:39:36 -07:00
61653165f8 udpate error message #1459 Jonathan Wren 2022-04-30 12:35:18 -07:00
5b589c5b2d

Fix and add tests for empty config file Micah Jerome Ellison 2022-04-30 12:00:45 -07:00
d21398ee60 Update changelog [ci skip] Jrnl Bot 2022-04-30 18:30:34 +00:00
2b3cf88097

Bump pytest from 7.1.1 to 7.1.2 (#1458) dependabot[bot] 2022-04-30 11:29:03 -07:00
e2f0f8cc9b

Bump cryptography from 36.0.2 to 37.0.1 (#1462) dependabot[bot] 2022-04-30 11:28:34 -07:00
62d59083b5

Bump jinja2 from 3.0.3 to 3.1.2 #1463 dependabot[bot] 2022-04-29 00:39:35 +00:00
8f014f96cf

Bump cryptography from 36.0.2 to 37.0.1 #1462 dependabot[bot] 2022-04-28 00:06:38 +00:00
ca96e3175e Added check for empty config file and if so, use default config Jonathan van der Steege 2022-04-27 17:07:57 +02:00
602dad7e06 Added check for empty config file and if so, use default config Jonathan van der Steege 2022-04-27 17:04:56 +02:00
0dc2aa1161

Bump cryptography from 36.0.2 to 37.0.0 #1460 dependabot[bot] 2022-04-27 00:07:20 +00:00
fb20f2ffa2 Display "Entry not saved" after empty entry on cmdline apainintheneck 2022-04-25 17:41:14 -07:00
9ea7f6c956

Bump pytest from 7.1.1 to 7.1.2 #1458 dependabot[bot] 2022-04-25 00:53:47 +00:00
3f7dd19d90 Add a test to make sure running --change-time with nothing prints a warning and doesn't change anything Richard Schneider 2022-04-23 21:03:55 -05:00
329d889fc3 Add warning when --change-time used with no matching entries Richard Schneider 2022-04-23 20:54:06 -05:00
14cba37bb9 Remove todo from --change-time bdd folder journal tests Richard Schneider 2022-04-23 16:57:53 -05:00
dabf01caec Update mkdocs in poetry to match the readthedocs and add comments that they should be the same in both #1453 Micah Jerome Ellison 2022-04-23 13:09:11 -07:00
6fb2bba3bc Pin latest mkdocs and jinja2 for readthedocs Micah Jerome Ellison 2022-04-23 13:01:06 -07:00
ad5266670b Implement --change-time flag Richard Schneider 2022-04-23 11:25:56 -05:00
85400301ad

Bump jinja2 from 3.0.3 to 3.1.1 #1450 dependabot[bot] 2022-04-21 00:06:57 +00:00
97f326a59c Update changelog [ci skip] Jrnl Bot 2022-04-16 18:31:52 +00:00
4d72f0be62

Bump pyproject-flake8 from 0.0.1a3 to 0.0.1a4 (#1447) dependabot[bot] 2022-04-16 11:29:53 -07:00
deb552ea9b

Bump pyproject-flake8 from 0.0.1a3 to 0.0.1a4 #1447 dependabot[bot] 2022-04-12 00:10:45 +00:00
3d036256b2 Update changelog [ci skip] Jrnl Bot 2022-04-09 21:00:41 +00:00
96d45847f9

Bump pyproject-flake8 from 0.0.1a2 to 0.0.1a3 (#1440) dependabot[bot] 2022-04-09 13:58:58 -07:00
026cafad3f

Bump mkdocs from 1.2.3 to 1.3.0 (#1441) dependabot[bot] 2022-04-09 13:58:43 -07:00
2c626844ef

Bump black from 22.1.0 to 22.3.0 (#1442) dependabot[bot] 2022-04-09 13:58:21 -07:00
4fc9a15ceb

Bump tzlocal from 2.1 to 4.2 #1443 dependabot[bot] 2022-04-04 00:31:13 +00:00
a071a9c8d5

Bump black from 22.1.0 to 22.3.0 #1442 dependabot[bot] 2022-03-29 00:06:38 +00:00
9ae338f633

Bump mkdocs from 1.2.3 to 1.3.0 #1441 dependabot[bot] 2022-03-28 00:29:12 +00:00
007b4d5000

Bump pyproject-flake8 from 0.0.1a2 to 0.0.1a3 #1440 dependabot[bot] 2022-03-28 00:28:04 +00:00
650aeb387b Update changelog [ci skip] Jrnl Bot 2022-03-26 18:50:20 +00:00
23839305d8

Pin jinja2 in docs requirements to keep readthedocs builds from failing (#1439) Micah Jerome Ellison 2022-03-26 11:48:41 -07:00
4000f18c42 Fix "jinja2" (instead of "jinja") #1439 Micah Jerome Ellison 2022-03-26 11:45:01 -07:00
d7d85aa85c Try pinning to jinja 3.0.3 Micah Jerome Ellison 2022-03-26 11:43:46 -07:00
e337e77458 Unpin jinja and remove deprecated python version setting Micah Jerome Ellison 2022-03-26 11:40:14 -07:00
1762dee879

Bump tzlocal from 2.1 to 4.1 #1369 dependabot[bot] 2022-03-26 18:39:00 +00:00
78a55977f6 Change read the docs Python version from 3.7 to 3.10 Micah Jerome Ellison 2022-03-26 11:37:40 -07:00
17e09df050 Update changelog [ci skip] Jrnl Bot 2022-03-26 18:36:47 +00:00
d405e92292

Remove sample format and its asteval dependency (#1436) Micah Jerome Ellison 2022-03-26 11:35:14 -07:00
5689db00bd Attempt to pin jinja requirement to keep readthedocs from failing Micah Jerome Ellison 2022-03-26 11:34:04 -07:00
a969f9b3fb Update changelog [ci skip] Jrnl Bot 2022-03-26 18:25:14 +00:00
a40d4536f6

Bump pytest from 7.0.1 to 7.1.1 (#1430) dependabot[bot] 2022-03-26 11:23:28 -07:00
edc2e524f7

Bump pytz from 2021.3 to 2022.1 (#1438) dependabot[bot] 2022-03-26 11:21:43 -07:00
e52e0899be

Bump pytz from 2021.3 to 2022.1 #1438 dependabot[bot] 2022-03-21 00:28:57 +00:00
706a59e28d Remove sample format and its asteval dependency #1436 Micah Jerome Ellison 2022-03-19 14:39:25 -07:00
bc42f74b2b

Reformat additional messages and finish centralizing exception handling (#1424) Jonathan Wren 2022-03-19 12:30:23 -07:00
a1117918dd Update changelog [ci skip] Jrnl Bot 2022-03-19 19:09:40 +00:00
7cb8345e85

Bump cryptography from 36.0.1 to 36.0.2 (#1427) dependabot[bot] 2022-03-19 12:07:56 -07:00
9d3d898f3c

Bump pytest from 7.0.1 to 7.1.1 #1430 dependabot[bot] 2022-03-18 00:07:34 +00:00
3f58f09083

Bump cryptography from 36.0.1 to 36.0.2 #1427 dependabot[bot] 2022-03-16 00:07:41 +00:00
b16b4b9975

Bump pytest from 7.0.1 to 7.1.0 #1426 dependabot[bot] 2022-03-14 00:31:37 +00:00
3d28f977fb fix mangled lock file #1424 Jonathan Wren 2022-03-13 15:06:21 -07:00
132bd78c99 update test Jonathan Wren 2022-03-12 15:08:25 -08:00
691546588c update uncaught exception for new handling Jonathan Wren 2022-03-12 15:05:02 -08:00
d863d217a0 clean up linting issue Jonathan Wren 2022-03-12 14:59:11 -08:00
0d823155d0 clean up old code Jonathan Wren 2022-03-12 14:57:21 -08:00
c7c6ecfdf9 clean up old code Jonathan Wren 2022-03-12 14:54:30 -08:00
4a4a874f9f reformat with black Jonathan Wren 2022-03-12 14:53:04 -08:00
548ac582d9 replace sys.exit call with new exception handling Jonathan Wren 2022-03-12 14:47:28 -08:00
c5fc211ae9 replace sys.exit call with new exception handling Jonathan Wren 2022-03-12 14:42:04 -08:00
6a4915c393 replace sys.exit call with new exception handling Jonathan Wren 2022-03-12 14:32:20 -08:00
66ce8debe5 fix merge errors Jonathan Wren 2022-03-12 14:25:58 -08:00
2051f04839 merge in develop Jonathan Wren 2022-03-12 13:54:11 -08:00
7a42800168 Update changelog [ci skip] Jrnl Bot 2022-03-12 21:26:01 +00:00
d3de5b778b

Replace PyYAML with ruamel.yaml (#1416) Micah Jerome Ellison 2022-03-12 13:24:31 -08:00
a013a87c6d Run make format #1416 Micah Jerome Ellison 2022-03-12 13:18:32 -08:00
9833ee9911 Merge branch 'develop' into ruamel Micah Jerome Ellison 2022-03-12 13:15:21 -08:00
e46b5a171f

Fix tests for daylight savings (#1423) Jonathan Wren 2022-03-12 13:14:26 -08:00
bd0cf5fdcf fix copypasta #1423 Jonathan Wren 2022-03-12 13:06:38 -08:00
0228f652d6 update title of test Jonathan Wren 2022-03-12 13:06:12 -08:00
6b1c40bcd7 whitespace change Jonathan Wren 2022-03-12 12:59:33 -08:00
937eb08610 add test for newly discovered daylight savings issue (and skip for now) Jonathan Wren 2022-03-12 12:59:26 -08:00
a778fc2dcb fix test failing because tomorrow is daylight savings Jonathan Wren 2022-03-12 12:58:57 -08:00