Commit graph

1021 commits

Author SHA1 Message Date
Jrnl Bot
982aad0a16
Update changelog [ci skip] 2020-07-25 16:34:16 -07:00
Jrnl Bot
99e2f7bab8
Increment version to v2.4.4-beta 2020-07-25 16:34:09 -07:00
Jrnl Bot
14bcb2c1af Update changelog [ci skip] 2020-07-18 20:03:04 +00:00
Jonathan Wren
a11aa24c7e Allow editing of DayOne entries (#1001)
* add test to repro issue #955

* Allow editing of DayOne entries

* Add broken test for Dayone

Add test for editing Dayone entries (this test currently fails)

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>

* Fix editing logic for DayOneJournal

DayOneJournal previously reimplemented Journal._parse inside of
DayOneJournal.parse_editable_string, and in doing so caused issues
between itself and the class it was inheriting from. This commit fixes
the issue by moving the UUID to be in the body of the entry, rather than
above it. So, then Journal._parse still finds the correct boundaries
between entries, and DayOneJournal then parses the UUID afterward.

Co-authored-by: MinchinWeb <w_minchin@hotmail.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-07-18 12:54:52 -07:00
Jrnl Bot
4c2f2861db Update changelog [ci skip] 2020-07-18 19:17:27 +00:00
Jonathan Wren
6abee8e9d6 fix readme link to submit an issue (#1002) 2020-07-18 12:08:34 -07:00
MinchinWeb
78aa2548ac Update documentation.md (#1003)
Hoping to make the language more positive.
2020-07-17 18:42:45 -07:00
Jrnl Bot
0702e6f2b6 Update changelog [ci skip] 2020-07-12 23:32:19 +00:00
Micah Jerome Ellison
4ca6e3f95f Display warning if Python version is less than 3.7 (#994)
* Add Python version check and faulty test to confirm it's working (should fail on 3.6 build only)
* Apply formatting
* Fix behave Python version test
* Make error message more descriptive and friendly
2020-07-12 16:24:46 -07:00
Jrnl Bot
686fc0cfdf Update changelog [ci skip] 2020-07-11 17:45:37 +00:00
Jonathan Wren
c9fc298317 Add new documentation issue type to github templates (#1000) 2020-07-11 10:34:52 -07:00
Micah Jerome Ellison
f7a49d715e 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
89624c155b Update changelog [ci skip] 2020-06-20 21:38:19 +00:00
Micah Jerome Ellison
8d702fee9d 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
e4f1453cc9 Update changelog [ci skip] 2020-06-20 21:18:17 +00:00
Jonathan Wren
919ab7902d 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
52a0ccb780 Update changelog [ci skip] 2020-06-20 11:58:21 -07:00
Micah Jerome Ellison
28093894ad Add diagnostic argument #727 (#984) 2020-06-20 11:18:53 -07:00
Jrnl Bot
4238ca57de Update changelog [ci skip] 2020-06-13 19:05:43 +00:00
eshrh
be38cfa87a 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
c1b93cf81b Update changelog [ci skip] 2020-06-13 18:16:25 +00:00
eshrh
2a3fd820b9 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
d9951b54c0 Fix typo (#976)
i twitched
2020-06-06 12:56:02 -07:00
Jrnl Bot
9f9c0089c8 Update changelog [ci skip] 2020-06-06 19:55:28 +00:00
Eshan
74724b2185 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
ca73c74a8e 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
404760876f 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
759c69c497 Increment version to v2.4.3-beta 2020-05-30 19:47:13 +00:00
Eshan
0b9137c17d 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
ca482b0a46 Update changelog [ci skip] 2020-05-28 01:30:43 +00:00
Jonathan Wren
7c7e2fae82 Fix for hanging Windows tests on Travis (#969) 2020-05-27 18:22:09 -07:00
Jrnl Bot
99711675d4 Update changelog [ci skip] 2020-05-27 21:25:31 +00:00
Eshan
b575174a60 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
63df95f2ea 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
Micah Jerome Ellison
ef5f0a8331 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
ce0dd6881c 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
3550e56273 Update changelog [ci skip] 2020-05-23 23:07:59 +00:00
Jonathan Wren
e37fe2e4ce 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
a4d020423f 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
e6f828214b Update changelog [ci skip] 2020-05-22 18:47:28 +00:00
MinchinWeb
13d2b85d27 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
7290fa2a01 Update changelog [ci skip] 2020-05-16 20:02:14 +00:00
Olly Britton
7a7818ef24 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
b4089c125b Update changelog [ci skip] 2020-05-16 18:38:55 +00:00
Matt Abrams
aad2af1a8d 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
7149a82f66 Update changelog [ci skip] 2020-05-09 15:42:57 -07:00
Micah Jerome Ellison
fcf42e3233 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
1f1a57db89 Increment version to v2.4.2 2020-05-09 15:01:54 -07:00
Jonathan Wren
a15e6f7476 update travis config to fix deployment 2020-05-09 15:01:44 -07:00
Jonathan Wren
e5f59d7179 Use gitlab to trigger releases in pipeline (#947) 2020-05-09 14:12:14 -07:00