Commit graph

896 commits

Author SHA1 Message Date
Jonathan Wren
20c6010621 update contributing file 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
38b1bcbc4d [GH-1] updating readme to mention fork, instability
[GH-1] adding build badge back in
[GH-1] fussing with author text
2020-04-10 11:51:55 -07:00
Jonathan Wren
d3b7819bc1 [GH-3] update build badges 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
ccf0b7e039 #6 allowing template interpreter to interpret common Python commands 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
b56026d989 #5 Removing DayOne tests 2020-04-10 11:51:55 -07:00
Jonathan Wren
716ad98f97 update python version for ci 2020-04-10 11:51:55 -07:00
Jonathan Wren
13631b9a68 Fix issue #584 YAMLLoadWarning (#585) 2020-04-10 11:51:55 -07:00
hoclun-rigsep
6826f07b6e Use shlex to parse editor commandline as per 2.0-rc1 (#556) 2018-08-16 15:16:29 -07:00
Emma Humphries
240fb883cc Add instructions for VS Code (#544) 2018-06-26 11:28:23 -07:00
Jenny Li
9ec6569628 minor typo fixes (#515) 2018-02-16 14:35:47 -08:00
Radomír Bosák
d6db0c1549 Remove --use-mirrors switch from travis setup (#477)
The --use-mirrors pip switch does not work since pip 7.0.0. This caused
travis builds to fail.

This commit removes the --use-mirrors switch.
2017-03-10 09:47:43 -08:00
Radomír Bosák
8fe8e00e1b 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
ca2d9f072f 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
Radomír Bosák
095369f705 Fix behave tests by adding asteval dependency (#469) 2017-03-09 11:56:44 -08:00
Manuel Ebert
549a3e9d8f Clean up 2016-08-19 23:23:14 +00:00
Manuel Ebert
60a955de20 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
f4dfecb62f Fix JSON export 2016-08-19 21:44:12 +00:00
Manuel Ebert
6a53da5efd Indent character optional 2016-08-19 21:44:01 +00:00
Manuel Ebert
bdc9dc598d Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
69fc08f6f3 Upgrade to cryptography 1.4 2016-08-17 13:41:54 +00:00
Manuel Ebert
e7b8158d22 Update Cryptography
Fixes SSL issues described in
https://github.com/pyca/cryptography/issues/2750
2016-08-16 11:00:08 +02:00
Manuel Ebert
85934c1980 Exports 2016-07-17 13:35:35 -07:00
Philip Douglass
ba05411a80 User defined indent character (#419)
Make indent character configurable.
2016-04-15 23:00:49 -07:00
Manuel Ebert
dbf912c661 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
Manuel Ebert
4e153c6e09 Merge pull request #420 from philipsd6/2.0-better_textwrap
Clean up text wrapping once and for all --- Please!
2016-04-07 13:13:54 -07:00
Philip Douglass
b2147d53c5 Fully strip title and body after SENTENCE_SPLITTER search 2016-04-07 14:31:16 -04:00
Philip Douglass
eec009fd18 Clean up text wrapping once and for all 2016-04-07 14:29:28 -04:00
Manuel Ebert
3b7508eac6 Merge pull request #399 from philipsd6/2.0-upgrade_unicode_and_tildes
Support unicode and userdir expansion in config during 2.0 upgrade
2016-02-10 10:41:06 -08:00
Manuel Ebert
285c219bed Update dependencies and lock versions on keyring and cryptography. Fixes #407 2016-02-10 10:24:52 -08:00
Philip Douglass
04082d36c9 Open config_path as utf-8 2016-01-24 21:16:50 -05:00
Philip Douglass
9f7d71aa8f Expand vars and user tilde for upgrade backup 2016-01-24 21:09:17 -05:00
Manuel Ebert
452d99f835 Docs on Alfred integration
Fixes #364
2016-01-11 12:17:59 -08:00
Manuel Ebert
a56d65ca4c Doc update on HISTIGNORE
Fixes #394
2016-01-11 12:11:56 -08:00
Manuel Ebert
44e243a629 Byte encoding for getpass
Fixes #392 and #393
2016-01-11 12:08:05 -08:00
Manuel Ebert
87aeb17b2c Unicode literals in util 2015-12-28 22:07:26 -08:00
Manuel Ebert
f7b7a886c4 Remove references to jrnl[encrypted] 2015-12-28 21:56:08 -08:00
Manuel Ebert
c2ca11caa7 Drop whitespace in print
Fixes #222 and #376
2015-12-28 21:53:23 -08:00
flight16
28d87861cc Merged PR 2015-12-28 21:36:17 -08:00
Manuel Ebert
95d399d5c3 Seperation of title and entry is now purely virtual.
Fixes #360
2015-12-28 21:24:39 -08:00
Manuel Ebert
849dc89557 --export text doesn't indent
Fixes #373
2015-12-28 13:06:26 -08:00
Manuel Ebert
b2542db5e5 Fix XML export 2015-12-28 13:01:33 -08:00
Manuel Ebert
4adb5c252a Update tests for templates 2015-07-01 22:23:13 -07:00
Manuel Ebert
7c6b2e4bce Support for templates 2015-07-01 22:23:13 -07:00
Manuel Ebert
43bb1f1cb2 Merge pull request #349 from MinchinWeb/2.0-yaml-export-fixes
2.0 -- yaml export fixes, dayone fixes
2015-05-06 08:56:03 +02:00
MinchinWeb
a4496518de [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
1a220243bc Colorize error and warning messages 2015-05-05 15:12:02 -06:00
MinchinWeb
00c836032d [Dayone] clean up date code 2015-05-05 14:25:53 -06:00
MinchinWeb
b8dbf84753 [Dayone] cut extended attributes for now 2015-05-05 13:54:38 -06:00
MinchinWeb
eed1bd3cb3 [Dayone] allow variable length dates on edited Dayone entries 2015-05-05 13:21:46 -06:00
MinchinWeb
a329fe4874 [Dayone] fix reading dates off edited dayone entries 2015-05-05 13:07:25 -06:00