Commit graph

946 commits

Author SHA1 Message Date
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
MinchinWeb
cfadcd39ca Apply isort Mk II (#942)
* Apply isort!
2020-05-09 13:14:43 -07:00
Jrnl Bot
1cc3f80ba9 Updating changelog [ci skip] 2020-05-07 01:25:13 +00:00
Micah Jerome Ellison
4df4e56a96 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
b2c7d29909 add lockbot to lock comments on inactive, closed issues and prs (#938) 2020-05-06 18:14:27 -07:00
Jonathan Wren
ecb4562c29 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
c5f40f1d15 Updating changelog [ci skip] 2020-05-06 20:55:08 +00:00
Micah Jerome Ellison
d9ebfe852b 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
cfbebe0d38 Updating changelog [ci skip] 2020-05-05 20:02:05 +00:00
Micah Jerome Ellison
683a0bac6c Change github new issue link to issue template chooser (#936) 2020-05-05 12:51:03 -07:00
Micah Jerome Ellison
274d031ee7 Allow most recent pytz version and update dependencies (#937) 2020-05-05 12:49:24 -07:00
Jrnl Bot
dad972a1dd Incrementing version to v2.4.1 [ci skip] 2020-05-02 20:35:15 +00:00
Jrnl Bot
edcc6555ae Updating changelog [ci skip] 2020-05-02 20:33:49 +00:00
Jonathan Wren
6a0ee48f83 Disable --delete due to critical bug (#934) 2020-05-02 13:17:06 -07:00
MinchinWeb
db96ba7fb8 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
7b96169654 Incrementing version to v2.4 [ci skip] 2020-04-29 13:54:46 -07:00
Jrnl Bot
ec213d8185 Updating changelog [ci skip] 2020-04-29 13:54:43 -07:00
Jonathan Wren
fc2b49fbd3 Clean up readme file (#924) 2020-04-25 13:15:55 -07:00
Jrnl Bot
a6568ce0a4 Updating changelog [ci skip] 2020-04-25 17:38:43 +00:00
Epskampie
473187f4b8 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
db0caa7b83 Incrementing version to v2.4-beta [ci skip] 2020-04-18 14:48:11 -07:00
Jrnl Bot
61f1627264 Updating changelog [ci skip] 2020-04-18 14:48:07 -07:00
Jonathan Wren
c56dd7eb52 update makefile to match pipeline better 2020-04-18 13:58:57 -07:00
Jrnl Bot
45216b976c Updating changelog [ci skip] 2020-04-18 20:47:45 +00:00
Jonathan Wren
953560ba0a fix typo in poetry config 2020-04-18 13:40:47 -07:00
Jonathan Wren
e57a51ba25 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