fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-12 17:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1696 commits 10 branches 99 tags 14 MiB
Commit graph

1696 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Wren
64c0824a87
'write mode' -> 'append mode' in more places 2023-03-25 12:04:47 -07:00
Jonathan Wren
22409ffef4
fix merge conflict typo 2023-03-25 12:02:01 -07:00
Jonathan Wren
15a5b143ee Merge branch 'develop' into mode-actions-1639 
Conflicts:
  jrnl/controller.py
 2023-03-25 11:56:57 -07:00
Aaron Lichtman
a2b217fdfc
Add ability to use template with --template (#1667) 
* Add ability to pass template path with --template

Update jrnl/args.py

* Fix tests
 2023-03-25 11:47:00 -07:00
Jrnl Bot
0725ea6b87 Update changelog [ci skip] 2023-03-25 18:18:19 +00:00
renovate[bot]
dad2744e71
Update dependency cryptography to v40 (#1710) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-25 11:15:48 -07:00
Jrnl Bot
94f079293b Update changelog [ci skip] 2023-03-25 17:55:18 +00:00
renovate[bot]
55f7328b3e
Update dependency poethepoet to v0.19.0 (#1709) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-25 10:53:19 -07:00
Jrnl Bot
5a74b0e722 Update changelog [ci skip] 2023-03-18 20:00:55 +00:00
renovate[bot]
3764946dfe
Update dependency pytest-xdist to v3.2.1 (#1705) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:58:47 -07:00
renovate[bot]
1b7afe588b
Update dependency ipdb to v0.13.13 (#1703) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:57:47 -07:00
renovate[bot]
f7e2a59332
Update dependency flake8-type-checking to v2.3.1 (#1702) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:56:38 -07:00
renovate[bot]
fc9def0879
Update dependency pytest to v7.2.2 (#1704) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:56:10 -07:00
renovate[bot]
7cd301fcbf
Update dependency rich to v13.3.2 (#1706) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:55:42 -07:00
renovate[bot]
16fec7c87f
Update dependency tox to v4.4.7 (#1707) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:53:56 -07:00
Jrnl Bot
a7021b03e7 Update changelog [ci skip] 2023-03-18 19:47:29 +00:00
renovate[bot]
d24a73e349
Update dependency cryptography to v39.0.2 (#1701) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:45:21 -07:00
Jrnl Bot
d67310ec90 Update changelog [ci skip] 2023-03-18 19:39:00 +00:00
renovate[bot]
0f203fb198
Update dependency tzlocal to v4.3 (#1708) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-03-18 12:36:58 -07:00
Jonathan Wren
e813ff7b3f add encrypted to tests for change-time 2023-03-04 14:38:25 -08:00
Jonathan Wren
33263f1b48 rename test file 2023-03-04 14:38:23 -08:00
Jonathan Wren
85a759ebba
add encrypted to tests 2023-03-04 14:31:19 -08:00
Jonathan Wren
e6a36a9c0a
run format 2023-03-04 14:23:28 -08:00
Jonathan Wren
9bca32b438
Merge branch 'develop' into mode-actions-1639 
Conflicts:
  CHANGELOG.md
  docs/privacy-and-security.md
  jrnl/controller.py
  tests/bdd/features/change_time.feature
 2023-03-04 14:07:46 -08:00
Micah Jerome Ellison
eac0571709 run poe format 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
7eec231095 Track added/deleted counts in a register in the Journal class instead of attempting to infer it via controller counting 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
9f44ab22ce Remove extraneous comment in test 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
0e70a57a67 Add tests for counting combinations of action arguments (change-time, edit, delete) and for change-time counts. Some are failing and should be investigated 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
94d78f3e2d Test combinations of found/deleted messages when using --delete 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
4ad9f58213 Add tests for found count with -n equivalent argument 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
14fd024ed1 Add found/modified counts to edit tests 2023-03-04 13:58:20 -08:00
Jrnl Bot
c8d79d075d Update changelog [ci skip] 2023-03-04 13:58:20 -08:00
Briscoooe
a708c15eb7 Don't save templated journal entries if the received raw text is the same as the template itself (#1653) 2023-03-04 13:58:20 -08:00
David Isaksson
3ec0839748 Add documentation about information leaks in Vim/Neovim (#1674) 
* Add documentation about using Vim/Neovim as editor
* Add documentation about information leaks in editors
* Spelling fix

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2023-03-04 13:58:20 -08:00
Jrnl Bot
99c29f2051 Update changelog [ci skip] 2023-03-04 13:58:20 -08:00
Giuseppe D'Andrea
905a9ec37e Update documentation on temporary files naming (#1673) 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
2be80a5fa0 Fix other unit test that did not account for short-circuit 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
8ee1632760 Fix unit test that did not account for new short-circuit when displaying journal with no entries 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
46b7a64549 Reconcile tests with new error message when clearing editor in edit mode 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
cac3b43e19 Preserve existing behavior when editor is empty but make the message more clear 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
742a16b548 Track modification of entries with --change-time 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
80a4b0778f Correct entry edit modified count test 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
1873f69ded Remove unneeded exception when editor is empty and fix test that was testing incorrect message 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
2e06e3d4eb Track journal entry deletion consistently 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
0c439200f4 Track found entry count and remove incorrect modified stat logic 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
d341f3240c Don't show summary if no entries found and prevent extra line break when no entries found by short-circuiting display method 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
752e55d363 Add currently-failing test conditions for count messages when changing time and deleting 2023-03-04 13:58:20 -08:00
Jonathan Wren
c182395fce Clean up controller 
- streamline `run` function in `controller.py`
- add debug logging
- fix unnecessary import of Journal class (only needed for typing)
- standardize summary display across different actions
 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
bade98ef0d Fix user input mock - was not appropriately checking return value 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
6e24769294 Fix failing change-time test by using same method signature as base journal class 2023-03-04 13:58:20 -08:00