fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-21 05:28:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
823 commits 12 branches 99 tags 13 MiB
Commit graph

377 commits

Author SHA1 Message Date
Jonathan Wren
25c0feaab6
Merge branch 'master' into fix-custom-dates 2019-11-11 21:08:37 -08:00
Jonathan Wren
c098888612
Merge pull request #705 from pspeter/cleanup-py2-leftovers 
remove py2 remnants and use mocks in tests
 2019-11-11 20:53:10 -08:00
MinchinWeb
971560edac [Upgrade to 2.0] Expand User directory (#704) 2019-11-07 17:20:57 -08:00
Peter Schmidbauer
7d9795ace6 fixup! remove py2 remnants and use mocks in tests 2019-11-04 16:36:16 +01:00
Peter Schmidbauer
827a598dd8 Drop use of codecs package 
Use builtins.open() instead
 2019-11-01 21:48:04 +01:00
Peter Schmidbauer
65adb92ed4 small print bugfix 
The file=sys.stderr was part of the format(), so an error got printed to stdout
 2019-11-01 20:05:06 +01:00
Peter Schmidbauer
d47e1ed479 fixup! remove py2 remnants and use mocks in tests 2019-11-01 19:58:32 +01:00
Peter Schmidbauer
5cee4fb783 run pyupgrade on plugin dir 2019-11-01 19:57:24 +01:00
Peter Schmidbauer
dace253513 fix broken pyupgrade fstring 2019-11-01 13:16:10 +01:00
Peter Schmidbauer
30caf9cae2 Run pyupgrade 2019-11-01 11:16:12 +01:00
Peter Schmidbauer
1c403904e5 fstring wip 2019-11-01 10:37:12 +01:00
Peter Schmidbauer
34f8f858f1 remove py2 remnants and use mocks in tests 2019-10-31 21:16:19 +01:00
Peter Schmidbauer
1fa851ed0c Fix handling of little-endian date format 
Ever since version 2.0, when parsing a journal file, jrnl would not use the custom date format string anymore. Instead, it relied on the dateutil library to get the parsing right. This change was made to allow people to change their date format without having to manually change their file. However, this broke some existing date formats like %d.%m.%Y, as it would falsely interpret the month as day and vice versa. This commit adds some tests to catch this error and fixes it by trying to parse the dates using the custom format first, only falling back to dateutil when needed.
 2019-10-26 21:58:15 +02:00
Jonathan Wren
ee5d450cbe remove faulty conditional 2019-10-05 16:27:18 -07:00
Jonathan Wren
f9e746fe24 Merge branch 'pr/merge-v2.1' 
Conflicts:
setup.py
 2019-10-05 16:00:52 -07:00
Jonathan Wren
b8a2c2df9d
Merge pull request #637 from jprof/add-not-flag 
Add '-not' flag for excluding tags from filter
 2019-09-21 12:37:34 -07:00
Jonathan Wren
20916eab54
Merge pull request #550 from silenc3r/master 
Handle KeyboardInterrupt when installing journal
 2019-09-21 12:36:49 -07:00
micahellison
fe48a928d8
Merge pull request #657 from jrnl-org/v2.0.1 
Prep v2.0.1
 2019-09-21 12:13:44 -07:00
Micah Jerome Ellison
be35904912 [GH-632] adding call to action to report issue when upgrade fails 2019-08-24 15:47:13 -07:00
Micah Jerome Ellison
244165664b [GH-632] removing unreachable return statement 2019-08-24 15:25:05 -07:00
Micah Jerome Ellison
4d0640e613 [GH-632] removing unnecessary whitespace 2019-08-24 15:14:15 -07:00
Micah Jerome Ellison
a4e881942a [GH-632] raising exception in upgrade.py on fail 
Handling it in install.py to prevent config from being overwritten when upgrade fails
 2019-08-24 15:01:23 -07:00
Micah Jerome Ellison
3bfd9f487b [GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not 2019-08-24 13:50:10 -07:00
Jonathan Wren
6d3c35b2f7
Merge pull request #639 from MinchinWeb/export-md-headers 
Switch to hashmark Markdown headers on export (Mk II)
 2019-08-15 18:45:23 -07:00
Manuel Ebert
6a717029a7 Add deployment through poetry to travis 2019-08-15 17:44:27 -07:00
micahellison
ec1b2c63b9
Merge pull request #641 from gregorybodnar/create_encrypted_journal 
Fix for #631 Create encrypted journal
 2019-08-13 12:17:12 -07:00
Jonathan Wren
1350bcad1b #631 Escape data in square brackets 2019-08-10 13:37:03 -07:00
Jonathan Wren
e189ac12fe fix a few linting errors 2019-08-10 12:17:36 -07:00
Dawid Zych
960573c103 Handle KeyboardInterrupt when installing journal 2019-08-07 19:17:02 +02:00
Greg Bodnar
290bb96daa Use util wrapper for getpass 
This allows for tests to run without prompting for user input.
 2019-08-04 13:21:40 +12:00
Greg Bodnar
da62e54245 Overload open for EncryptedJournal 
This avoids the execution path that calls EncryptedJournal._create()
without a password parameter. It results in duplication of code that
requests and stores a password, which should be factored out in a
subsequent change.
 2019-08-04 08:40:15 +12:00
MinchinWeb
e95290f92f [YAML Exporter] apply fix just applied to Markdown Exporter 2019-08-01 21:21:55 -06:00
MinchinWeb
1884a6ce23 [Markdown Export] deal with linebreaks in jrnl files 2019-08-01 21:00:53 -06:00
MinchinWeb
4513609954 Switch to hashmark Markdown headers on export 
Closes #487
 2019-08-01 20:24:03 -06:00
Justin Proffitt
0a1966e3b3 Add '-not' flag for excluding tags from filter 2019-07-28 22:21:02 -04:00
Micah Jerome Ellison
683e369d53 Updating Python version and jrnl version for v2.0-rc3 2019-07-20 15:17:53 -07:00
Micah Jerome Ellison
f3b9a91c9b [GH-614] resolving issues around unreadable dates and unparsed dates 2019-07-20 14:51:46 -07:00
Micah Jerome Ellison
d413a6b7e6 #6 allowing template interpreter to interpret common Python commands 2019-06-22 14:35:27 -07:00
Jonathan Wren
bcfd2d4b43 Fix issue #584 YAMLLoadWarning (#585) 2019-04-14 09:47:31 -07:00
hoclun-rigsep
101aeaabb5 Use shlex to parse editor commandline as per 2.0-rc1 (#556) 2018-08-16 15:16:29 -07:00
Radomír Bosák
a95859a292 Catch keyboard interrupt when opening journal (#476) 
If the journal is encrypted, jrnl asks for a password using the
getpass.getpass function. If user presses the keyboard interrupt (e.g.
ctrl+c) during the password prompt, jrnl crashes and prints a stack
trace. This however is not very user friendly.

This commit adds a check for KeyboardInterrupt Exception and prints a
message whenever this exception occurs and exits. Stack is no longer
printed.

Fixes #450
 2017-03-10 08:54:02 -08:00
Radomír Bosák
d65a9779ca Fix python2 error in template_explorer.py (#471) 
If template_explorer.py was imported in python2, it would fail because
it uses unicode_literals which would ultimately cause passing an unicode
string as the first argument to the 'type' built-in function.

This commit fixes this by converting the unicode to string before it is
passed to the 'type' function.

Fixes #456
 2017-03-09 11:59:03 -08:00
Manuel Ebert
4b3dc38e05 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
ce113af4e0 Fix JSON export 2016-08-19 21:44:12 +00:00
Manuel Ebert
dab853555e Indent character optional 2016-08-19 21:44:01 +00:00
Manuel Ebert
b3f5c092de Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
49a374e552 Upgrade to cryptography 1.4 2016-08-17 13:41:54 +00:00
Manuel Ebert
8b64cc95d9 Exports 2016-07-17 13:35:35 -07:00
Philip Douglass
3580154f7d User defined indent character (#419) 
Make indent character configurable.
 2016-04-15 23:00:49 -07:00
Manuel Ebert
5921cd63f8 Merge pull request #417 from philipsd6/2.0-strip_entry_body 
Fully strip title and body after SENTENCE_SPLITTER search
 2016-04-07 13:15:12 -07:00