Commit graph

937 commits

Author SHA1 Message Date
micahellison
f24cc0eead
Ensure test data is always checked out with LF line endings (#965)
* Force *.journal line endings to LF
* Force LF line endings for .feature files
2020-05-27 14:08:48 -07:00
Guy B. deBros
ea14e48759
Cleaned up usage.md for clarity, formatting, and grammar. (#956)
* Cleaned up usage.md for clarity, formatting, and grammar.

While working on it, I hard-wrapped the lines to 80 characters. Hope that doesn't complicate things.

Note: I changed the Steve Buscemi quote to maintain compliance with the Code of Conduct.

* more changes to the usage page

Includes information about two new functions (`--delete`) and (`-contains`).
It's starting to look quite different from the original...
2020-05-27 14:07:43 -07:00
Jrnl Bot
b6d1ecc0af Update changelog [ci skip] 2020-05-23 23:07:59 +00:00
Jonathan Wren
48afaf942b
Clean up templates and issues (#954)
* clean up templates and issues
* fix some title-casing
2020-05-23 15:58:04 -07:00
Jonathan Wren
c456b85bc5
Fix editor config when an argument with a space is used (#953)
* Fix editor config when an argument with a space is used
* skip broken test on windows
* fix jrnl not behaving nicely with testing suite
* fix argument parsing for test suite
* fix one windows test, disable one windows test
2020-05-23 15:56:31 -07:00
Jrnl Bot
7600e14278 Update changelog [ci skip] 2020-05-22 18:47:28 +00:00
MinchinWeb
678a24110b
Update lockbot comment to encourage linking to issue (#941)
* improvements to lockbot for Github comments
* [lockbot] just the comment
2020-05-22 11:39:10 -07:00
Jrnl Bot
732831695f Update changelog [ci skip] 2020-05-16 20:02:14 +00:00
Olly Britton
7d4afd1c7a
Ask for password before adding entry instead of after (#951)
* ask for password before adding entry (#799)

This fixes #799 because previously it would allow you to create an
entry using your editor and then attempt to open the journal. This
behaviour is fine for unencrypted journals but with encrypted journals
it means that if you get the password wrong three times then the entry
you just wrote is lost.

Swapping the order around so that the entry is opened first in the code
and then the editor is added means that this can't happen.
2020-05-16 12:55:04 -07:00
Jrnl Bot
e793c07223 Update changelog [ci skip] 2020-05-16 18:38:55 +00:00
Matt Abrams
cdaf1f5a36 typo in recipes.md (#952)
typo in recipes.md. two verbs in a row. only one is needed :)
cheers
mja
2020-05-16 11:27:52 -07:00
Jrnl Bot
15c52d7ed1 Update changelog [ci skip] 2020-05-09 15:42:57 -07:00
micahellison
d9b2b2d790
Fix duplicate text in multiple tag search by removing selective coloring on searched tags only #926 (#948) 2020-05-09 15:13:16 -07:00
Jrnl Bot
d26c86e659 Increment version to v2.4.2 2020-05-09 15:01:54 -07:00
Jonathan Wren
00f817e69a update travis config to fix deployment 2020-05-09 15:01:44 -07:00
Jonathan Wren
ab9df2051e
Use gitlab to trigger releases in pipeline (#947) 2020-05-09 14:12:14 -07:00
MinchinWeb
e14d479471
Apply isort Mk II (#942)
* Apply isort!
2020-05-09 13:14:43 -07:00
Jrnl Bot
952cb9060a Updating changelog [ci skip] 2020-05-07 01:25:13 +00:00
micahellison
fedcab8c8e
Improve privacy, security, and encryption documentation #896 (#925)
* Improve privacy, security, and encryption documentation #896
* Use gentler language and ensuring documentation does not read like legal advice
2020-05-06 18:14:44 -07:00
Jonathan Wren
ac22fda24e
add lockbot to lock comments on inactive, closed issues and prs (#938) 2020-05-06 18:14:27 -07:00
Jonathan Wren
0a3278d55e
Make sure testing cleans up after itself (#940)
This adds the ability to run commands in a cache directory without the
test writer knowing where the cache directory is located. This will let
us expand later if we want to start using system temp folders, without
having to rewrite any of our tests.

* clean up extra directories after running behave
* clean up white space issues
* move repeated code into function
* clean up behave code for creating cache directories
* Fix for windows shell parsing in our test suite

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-05-06 18:13:36 -07:00
Jrnl Bot
3d5b30eb59 Updating changelog [ci skip] 2020-05-06 20:55:08 +00:00
micahellison
e302ecbcdd
Prevent filtered delete from deleting journal (#935)
* Prevent filtered deletion from deleting entire journal #932 and add lots of deletion tests
* Undo removal of deletion feature
* Use more performant deletion
2020-05-06 13:47:39 -07:00
Jrnl Bot
065f38cfe4 Updating changelog [ci skip] 2020-05-05 20:02:05 +00:00
micahellison
9e1b80d7cd
Change github new issue link to issue template chooser (#936) 2020-05-05 12:51:03 -07:00
micahellison
267698fcdf
Allow most recent pytz version and update dependencies (#937) 2020-05-05 12:49:24 -07:00
Jrnl Bot
2d748bd3f3 Incrementing version to v2.4.1 [ci skip] 2020-05-02 20:35:15 +00:00
Jrnl Bot
c692b28636 Updating changelog [ci skip] 2020-05-02 20:33:49 +00:00
Jonathan Wren
4b58577f1d
Disable --delete due to critical bug (#934) 2020-05-02 13:17:06 -07:00
MinchinWeb
870c325e3c
GitHub Pull Request Template Update (#927)
* Improve GitHub PR Template
* suggest running commands with `poetry run ...`

pyflakes here is given only certain subdirectories because `.` will try and run across all packages installed in the virtual environment, if the virtual environment is within the project's root folder (which is my common practice).
2020-05-02 12:06:23 -07:00
Jrnl Bot
3820c1f4ba Incrementing version to v2.4 [ci skip] 2020-04-29 13:54:46 -07:00
Jrnl Bot
0c9c4b3f7a Updating changelog [ci skip] 2020-04-29 13:54:43 -07:00
Jonathan Wren
4335e19a49
Clean up readme file (#924) 2020-04-25 13:15:55 -07:00
Jrnl Bot
43410de659 Updating changelog [ci skip] 2020-04-25 17:38:43 +00:00
Epskampie
82a0a8ae2b
Docs: editing config isn't always destructive (#923)
Editing the config file doen't always destroy your journal, luckily :-)
2020-04-25 10:31:38 -07:00
Jrnl Bot
7a0f55476c Incrementing version to v2.4-beta [ci skip] 2020-04-18 14:48:11 -07:00
Jrnl Bot
9310678ca4 Updating changelog [ci skip] 2020-04-18 14:48:07 -07:00
Jonathan Wren
23267b683f update makefile to match pipeline better 2020-04-18 13:58:57 -07:00
Jrnl Bot
38605bef76 Updating changelog [ci skip] 2020-04-18 20:47:45 +00:00
Jonathan Wren
2da0a6c58a fix typo in poetry config 2020-04-18 13:40:47 -07:00
Jonathan Wren
fae7585e54
Upgrade license to GPLv3 (#918)
The MIT license is a bit outdated, and doesn't provide the protections
we'd like in a modern open-source application.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-04-18 13:31:25 -07:00
jess
c33303bfd3 Add Open Collective information to README (#916)
* Added financial contributors to the README
2020-04-18 12:35:46 -07:00
Jrnl Bot
7f356701f2 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
MinchinWeb
6917f12b72 Update Windows Python versions (#910)
* [Travis] update Windows Python versions
* Update Python versions to be uniform across the board

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-18 12:35:46 -07:00
Jrnl Bot
655e745676 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Jonathan Wren
41c45463c7 fix import issues (from pyflakes merge) 2020-04-18 12:35:46 -07:00
MinchinWeb
b9993f3c1c Ensure exported entries end in a newline for Markdown and YAML exporters (#908)
* [Markdown Exporter] [YAML Exporter] Ensure exported entires end in a newline

Fixes #768, Fixes #881.

If the exported entry does not have a final empty line, this will add one on export. Some Markdown parsers get picky about not having a empty line above a heading....

* fix black formatting issues
* explicitly sort filenames

to deal with inconsistent default file ordering on different OS's
* Update .gitignore
* Update test for typo fix

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-18 12:35:46 -07:00
Jrnl Bot
1ac2ab3fdf Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Jonathan Wren
43f3a930e6 add pyflakes to dev deps, run pyflakes in CI 2020-04-18 12:35:46 -07:00
Jonathan Wren
3dc5999079 fix various small issues in the codebase 2020-04-18 12:35:46 -07:00