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

351 commits

Author SHA1 Message Date
MinchinWeb
f935b6bb68 [Dayone] don't break if the system timezone is UTC 2019-08-01 22:19:00 -06:00
MinchinWeb
43a8bba8c2
Merge branch 'master' into 2.0-dayone-fixes 2019-08-01 21:50:14 -06: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
MinchinWeb
e188b83efd [Dayone] fix typo 2019-07-19 14:29:14 -06:00
MinchinWeb
71329a7cab [Dayone] maintain metadata on edited entries; 
Fixes #358, See also #159
 2019-07-19 14:26:57 -06:00
MinchinWeb
7d3afd811b [Dayone] reverse fd46ffea23 
Brings back extended Dayone attributes
 2019-07-19 14:26:57 -06:00
MinchinWeb
50dfaf2f13 [Dayone] maintain existing tags stored in Dayone metadata 2019-07-19 14:24:49 -06:00
MinchinWeb
5a1a1e12fb [Upgrade] remove unused string parameter 2019-07-19 14:13:27 -06:00
MinchinWeb
319d6870e8 [YAML Export] style improvements 2019-07-19 14:13:26 -06:00
MinchinWeb
8e2989ef95 [Dayone] remove extra spaces from the titles of edited DayOne entries 
Otherwise, a leading space was being introduced
 2019-07-19 14:13:26 -06: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
Philip Douglass
1ac5444051 Fully strip title and body after SENTENCE_SPLITTER search 2016-04-07 14:31:16 -04:00
Philip Douglass
a4783109b3 Clean up text wrapping once and for all 2016-04-07 14:29:28 -04:00
Philip Douglass
91cf1c911f Open config_path as utf-8 2016-01-24 21:16:50 -05:00
Philip Douglass
1aef13d757 Expand vars and user tilde for upgrade backup 2016-01-24 21:09:17 -05:00
Manuel Ebert
06e3f0c101 Byte encoding for getpass 
Fixes #392 and #393
 2016-01-11 12:08:05 -08:00
Manuel Ebert
7a0e056130 Unicode literals in util 2015-12-28 22:07:26 -08:00
Manuel Ebert
5805cef008 Drop whitespace in print 
Fixes #222 and #376
 2015-12-28 21:53:23 -08:00
flight16
06a9ed2026 Merged PR 2015-12-28 21:36:17 -08:00
Manuel Ebert
79fa9c5434 Seperation of title and entry is now purely virtual. 
Fixes #360
 2015-12-28 21:24:39 -08:00
Manuel Ebert
76bc803776 --export text doesn't indent 
Fixes #373
 2015-12-28 13:06:26 -08:00
Manuel Ebert
168f63c657 Fix XML export 2015-12-28 13:01:33 -08:00
Manuel Ebert
dc39a25d5c Support for templates 2015-07-01 22:23:13 -07:00
MinchinWeb
549f8501d6 [CLI] display instructions to enter an entry on the command line when no editor is set 2015-05-05 15:30:18 -06:00
MinchinWeb
78bae0476c Colorize error and warning messages 2015-05-05 15:12:02 -06:00
MinchinWeb
c8b8fab684 [Dayone] clean up date code 2015-05-05 14:25:53 -06:00
MinchinWeb
fd46ffea23 [Dayone] cut extended attributes for now 2015-05-05 13:54:38 -06:00
MinchinWeb
e4249bb00c [Dayone] allow variable length dates on edited Dayone entries 2015-05-05 13:21:46 -06:00
MinchinWeb
4c7d37a153 [Dayone] fix reading dates off edited dayone entries 2015-05-05 13:07:25 -06:00
MinchinWeb
281b74da74 Fixes #348 
Also fixes #322 on windows.
 2015-05-05 11:58:15 -06:00
MinchinWeb
6444b6b137 code formatting 2015-05-04 12:08:05 -06:00
MinchinWeb
f7cadfc9dd [Dayone] Add Creator section to dayone import and YAML export 2015-05-04 00:21:33 -06:00
MinchinWeb
72cbafac55 [Util] delete old, unused code 2015-05-03 22:12:10 -06:00
MinchinWeb
2141bcacd4 [CLI] colour code 'no editor' error message 2015-05-03 21:59:20 -06:00
MinchinWeb
06dbe2fb30 [YAML export] remove lines that simply list tags 2015-05-03 21:36:16 -06:00
MinchinWeb
586ce47c68 [YAML export] only increase headings by one level 2015-05-03 19:56:16 -06:00
Manuel Ebert
bedab7c121 Fix for #332 2015-04-21 15:57:44 +02:00