Commit graph

962 commits

Author SHA1 Message Date
MinchinWeb
07bacabe8d Allow editing of DayOne entries 2020-07-02 21:42:55 -06:00
Jonathan Wren
6f7c538cb1 add test to repro issue #955 2020-07-02 00:14:03 -07:00
micahellison
f86d923843
Make behave output more concise when running make test (#988)
Make behave output more concise when running make test

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-06-27 17:51:31 -07:00
Jrnl Bot
bba18cd108 Update changelog [ci skip] 2020-06-20 21:38:19 +00:00
micahellison
878444b0ac
Add unit testing via pytest (#987)
* Add pytest to project

Includes a couple sample tests, a note in CONTRIBUTING, and inclusion in the makefile

* Include pytest in Travis build
2020-06-20 14:30:15 -07:00
Jrnl Bot
23c814748f Update changelog [ci skip] 2020-06-20 21:18:17 +00:00
Jonathan Wren
4e82ef5c06
Rename master branch to release (#985)
It's not our main branch anyway, and "release" makes it more clear what
it's for. There's an industry-wide trend to move away from terms that
invoke master/slave relationships in order to make members of
marginalized populations slightly less uncomfortable.
2020-06-20 14:11:03 -07:00
Jrnl Bot
951df2165b Update changelog [ci skip] 2020-06-20 11:58:21 -07:00
micahellison
7f8f238671
Add diagnostic argument #727 (#984) 2020-06-20 11:18:53 -07:00
Jrnl Bot
08e27b36c5 Update changelog [ci skip] 2020-06-13 19:05:43 +00:00
eshrh
37a47fa65c
Add tags to json and xml exporters (#975)
* tag array for json
* add tags to entry in xml
* xml test
* json test
* black
* removed called
2020-06-13 11:58:35 -07:00
Jrnl Bot
7106babfc8 Update changelog [ci skip] 2020-06-13 18:16:25 +00:00
eshrh
9668760b70
Create journal with absolute path when no path is specified (#972)
* create jrnl with abspath

Co-authored-by: = <esrh@netc.eu>
2020-06-13 11:08:22 -07:00
Eshan
7b09ff28b4
Fix typo (#976)
i twitched
2020-06-06 12:56:02 -07:00
Jrnl Bot
09ec5b4720 Update changelog [ci skip] 2020-06-06 19:55:28 +00:00
Eshan
d756f09e47
Create directory if it doesn't exist (#963)
* create dir if it doesn't exist
* switch order of print and creation
* makedirs instead of mkdir and stderr printing
* add test
* black reformatting
2020-06-06 12:46:06 -07:00
Guy B. deBros
79aad7c04d
Extensive modifications to overview.md (#957)
* Extensive modifications to overview.md.

I tried to add clarity and details while maintaining the spirit of the original
document. However, it might be a bit too 'dry' now. I'd be happy to liven it up
a bit. I'm only serious when I feel like I _have_ to be.

One of my opinions (which may be at odds with yours) is that the documentation
should emphasize `jrnl`'s advantages without downplaying any other existing
solutions.

If I have time, I'd like to add more information about the documented benefits
of journaling, particularly the mental health aspects. That will probably need
its own page, but I'm new here, so I don't want to overstay my welcome. :)

* More changes to overview.md in response to feedback

"why keep a journal" section removed -- it could be re-added as its own page,
but it's not front-page material

* More changes to overview.md:
- fixed up the headings
- added information about multi-platform support

This is a work in progress and _not_ ready for prime-time.
- need to add to Command-Line Interface section, among other things

* More changes to overview.md:

- moved "`jrnl` is a simple..." to "Command-Line Interface" section
2020-06-06 12:43:28 -07:00
MinchinWeb
61f5c3f2e3
Add extended metadata support for DayOne Classic (#928)
* Updating changelog [ci skip]

* Incrementing version to v2.4 [ci skip]

* [DayOne] remove extra spaces from the titles of edited DayOne entries

Otherwise, a leading space was being introduced

* [DayOne] maintain existing tags stored in DayOne metadata

* [DayOne] brings back extended DayOne attributes

* [DayOne] maintain metadata on edited entries

Fixes #358, See also #159

* [DayOne Exporter] apply black formatting

* [JSON Exporter] add support for extended DayOne Metadata

* [DayOne] [Tests] test that extended DayOne metadata is added to new entries

Co-authored-by: Jrnl Bot <jrnl.bot@gmail.com>
2020-06-06 12:41:15 -07:00
Jrnl Bot
3a94a4b215 Increment version to v2.4.3-beta 2020-05-30 19:47:13 +00:00
Eshan
52eaef25d6
Fix set_keychain errors (#964)
* fix keyring problems
* black
* remove else and use stderr
* black
* add tests
* black
* change description of nokeyring
* dumb syntax error
2020-05-30 12:43:10 -07:00
Jrnl Bot
30c4528149 Update changelog [ci skip] 2020-05-28 01:30:43 +00:00
Jonathan Wren
3b08710361
Fix for hanging Windows tests on Travis (#969) 2020-05-27 18:22:09 -07:00
Jrnl Bot
333a7ea57d Update changelog [ci skip] 2020-05-27 21:25:31 +00:00
Eshan
2311781882
Fix title splitting logic to account for both newlines and periods (#958)
* remove period parsing in title
* fix title splitter
* revert title-body switch
* keep both splitting types
* make black happy
* make it lstrip not strip
* fix title-body order for the last time
* make black happy again
* added test
* second test for single line entry with punctuation
* delete extra blank lines
2020-05-27 14:14:39 -07:00
wotgl
a07766099c
Speed up jrnl by 10%, improve slow imports (#959)
* Improve slow imports
* Fix codestyle
* fix twice version validation
* Fix a syntax mistake
2020-05-27 14:11:40 -07:00
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