Commit graph

1657 commits

Author SHA1 Message Date
Jonathan Wren
b44160c334
Merge branch 'develop' into pytest-bdd-6-1685
Conflicts:
poetry.lock
2023-02-25 15:31:38 -08:00
Micah Jerome Ellison
e6804f1627
Prompt to include colors in config when first running jrnl (#1687)
* Add prompt to ask user if entries should be formatted with colors when installing jrnl
* Use magenta instead of black for default date color
* Use other default colors and alphabetize color list
* Update tests
* Delete test file
* update lock file
* fix failing test after merge conflict

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-02-25 15:30:25 -08:00
Jonathan Wren
5d0c53bfa7
update lock file 2023-02-25 15:28:18 -08:00
Jonathan Wren
cf570eb733
add parse-type new dev/testing dependency 2023-02-25 15:28:10 -08:00
Jonathan Wren
37e2e6e453
update type builder to for should/should not to be in it's own file, rename some vars for readability 2023-02-25 15:23:45 -08:00
Jonathan Wren
95da5ea64a
update lock file 2023-02-25 15:01:28 -08:00
Jonathan Wren
c6cef96c9d
Merge branch 'develop' into pytest-bdd-6-1685
Conflicts:
poetry.lock
2023-02-25 14:59:56 -08:00
Jonathan Wren
75e145ae88
change output of failing test to be a little more useful 2023-02-25 14:58:04 -08:00
Jonathan Wren
3956b75698
fix get_fixture function 2023-02-25 14:57:51 -08:00
Jrnl Bot
fecd696b2a Update changelog [ci skip] 2023-02-25 20:31:52 +00:00
Micah Jerome Ellison
3c87111710
Save empty journal on install instead of just creating a zero-length file (#1690)
* Add failing test for issue #1493
* Write journal upon creation instead of just creating 0-length file
* Fix test to accommodate current password mocking form
2023-02-25 12:29:43 -08:00
Jrnl Bot
592e7bcf27 Update changelog [ci skip] 2023-02-25 20:18:29 +00:00
Micah Jerome Ellison
d81b5ad955
Support mkdocs 1.4.2 and fix its missing breadcrumb (#1691)
* Use latest mkdocs version 1.4.2
* Add docs_theme to mkdocs watch so it automatically reloads localhost when modifying theme
* Bring in ReadTheDocs breadcrumb theme and fix display issues around "Docs" root breadcrumb
* The problem is CSS, not the breadcrumbs template. Tightly scope offending CSS and remove breadcrumbs template override
* Bring mkdocs ReadTheDocs breadcrumbs theme back in
* Fix pa11y validation issue by replacing breadcrumb a alt attribute with aria-label
* Attribute source of new breadcrumbs file
* Use mkdocs 1.4 or greater with no upper bound
2023-02-25 12:16:33 -08:00
Micah Jerome Ellison
fcac94a30e
Document temporary file extension behavior when using template (#1686)
* Document jrnl's temp file behavior when using templates
* Move up "Files in transit from editor to jrnl" section and add notes about template extension behavior in solutions that reference .jrnl extension
* Update privacy-and-security.md
2023-02-25 12:15:52 -08:00
Giuseppe D'Andrea
18397b13eb
Update documentation about privacy and security in VSCode (#1680)
* docs: vscode file history

* docs: vscode unsaved files

* Edited for tone

---------

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2023-02-21 08:45:53 -08:00
Micah Jerome Ellison
9bb92707d0 Formatting 2023-02-20 13:57:18 -08:00
Micah Jerome Ellison
9b2805e948 Fix missing ShouldOrShouldNot 2023-02-20 13:12:30 -08:00
Micah Jerome Ellison
5af1050d9d Split "we use the config" and "we use no config" so pytest won't try to consume config_file as a fixture 2023-02-20 13:07:58 -08:00
Micah Jerome Ellison
931707b8ef Add missing "Outline" in scenario outlines with examples 2023-02-20 12:45:01 -08:00
Micah Jerome Ellison
51f8ef54bb Prevent greedy matching in "we run" by using regular expression lookahead 2023-02-20 12:22:22 -08:00
Micah Jerome Ellison
7c16f3d094 Fix greedy should_or_should_not parsing problems while also consolidating its parse/transformation-to-bool code 2023-02-20 12:02:14 -08:00
Micah Jerome Ellison
7308a1e293 Remove unused import 2023-02-20 11:28:28 -08:00
Jrnl Bot
b4da3a51f7 Update changelog [ci skip] 2023-02-11 20:40:50 +00:00
Briscoooe
b41a988d6f
Don't save templated journal entries if the received raw text is the same as the template itself (#1653) 2023-02-11 12:38:21 -08:00
David Isaksson
6c6937c507
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-02-11 12:16:31 -08:00
Jrnl Bot
6b179e673b Update changelog [ci skip] 2023-02-11 20:12:27 +00:00
Giuseppe D'Andrea
2d1a52afe5
Update documentation on temporary files naming (#1673) 2023-02-11 12:10:18 -08:00
Jonathan Wren
0c4600a2e5
fix password fixture 2023-02-04 14:06:12 -08:00
Jonathan Wren
f2317a491b
fix cli_run fixture 2023-02-04 13:08:31 -08:00
Jonathan Wren
d764914b54
fix some more tests 2023-02-04 11:39:39 -08:00
Jonathan Wren
a468510bcc
fix first test (inject command fixture to request) 2023-02-04 11:07:36 -08:00
Jonathan Wren
58af780f50
update lock file 2023-02-04 11:07:13 -08:00
Jonathan Wren
b02a92efec
update pytest-bdd to 6.0 2023-02-04 11:07:01 -08:00
Jrnl Bot
d4ce2a84cf Update changelog [ci skip] 2023-01-28 19:47:17 +00:00
Ciaran Concannon
7bd15d12ad
Search for entries with no tags or stars with -not -starred and -not -tagged (#1663)
* Allow for `-not -starred` to search for unstarred entries

* Add `-tagged` and `-not -tagged` functionality
2023-01-28 11:45:01 -08:00
Jrnl Bot
17c987c605 Update changelog [ci skip] 2023-01-14 22:44:27 +00:00
Jonathan Wren
fff05eb646
Refactor flow for easier access to some files (avoid things like jrnl.Journal.Journal and jrnl.jrnl co-existing) (#1662)
* run format

* rename cli.py to main.py

* rename jrnl.py to controller.py

* move journal class files into journals dir

* rename start -> run in controller.py
2023-01-14 14:42:29 -08:00
Jrnl Bot
7be67accc1 Update changelog [ci skip] 2023-01-14 21:24:31 +00:00
outa
a13726d4c5
Add more type hints (#1642) 2023-01-14 13:22:31 -08:00
Peter Conrad
9547411390
Update docs to include time and title in arguments with --edit (#1657) 2023-01-07 14:04:33 -08:00
Jrnl Bot
120c54a29e Update changelog [ci skip] 2023-01-07 22:01:41 +00:00
renovate[bot]
a6f2d34b7e
Update dependency rich to v13 (#1654)
* Update dependency rich to v13

* Update pyproject.toml

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-01-07 13:59:40 -08:00
Jonathan Ballet
458faff8a8
Fix markup in "Advanced Usage" doc (#1655)
* Fix YAML indentiation in a configuration example
* Improve Markdown markup
2023-01-07 13:58:49 -08:00
Jrnl Bot
2cec8bdc5b Update changelog [ci skip] 2023-01-07 21:41:17 +00:00
Jonathan Wren
8da6029624
Update copyright notices for 2023 (#1660)
* update copyright notice for 2023

* standardize whitespace after copyright notice
2023-01-07 13:39:07 -08:00
Micah Jerome Ellison
9274ab16ed
Add basic template test (#1659)
* Add very basic test template
* Ensure that templates are copied to temporary test workspace
* Add basic template test
* Update copyright for this new file
2023-01-07 13:37:43 -08:00
Jrnl Bot
d5d39971b4 Update changelog [ci skip] 2023-01-07 20:53:14 +00:00
Jonathan van der Steege
907566b39f
Add tag to XML file when edited DayOne entry and is searchable afterward (#1648)
* Add tag to XML file when edited DayOne entry
* Remove forbidden change
* undo edits
* Tags working for DayOne journal
* Correction doentries to prevent time-error
* Add sorting to tags
* Delete test statements
* Revert time changes
2023-01-07 12:51:07 -08:00
Jrnl Bot
7229d77bda Update changelog [ci skip] 2023-01-07 19:48:26 +00:00
Jonathan van der Steege
d94325127f
Update version key in config file after version changes (#1646) 2023-01-07 11:46:12 -08:00