Commit graph

701 commits

Author SHA1 Message Date
MinchinWeb
5dc724dd4d Don't break when system timezone is UTC 2017-11-13 20:20:11 -07:00
MinchinWeb
779a8f4ddf [Travis] Add newest versions of Python 2017-11-13 20:09:34 -07:00
MinchinWeb
9441998ecf Close file handle before passing edit's tempfile to editor.
PR #416
2017-11-13 17:57:54 -07:00
MinchinWeb
126e188c0f Make jrnl not depend on itself 2017-11-13 17:44:43 -07:00
MinchinWeb
89eba3e274 [Prjct Exporter] remove tag only lines 2017-11-13 16:23:18 -07:00
MinchinWeb
1c244da79b Add 'prjct' exporter. 2017-11-13 16:23:18 -07:00
MinchinWeb
b84bc9b856 [Export] remove extra spaces from Markdown, YAML exports 2017-11-13 16:21:44 -07:00
MinchinWeb
14ef6e3dcb [Travis-CI] Python 3.5 has been released 2017-11-13 16:21:44 -07:00
MinchinWeb
b11cbd9e6f [Dayone] fix typo 2017-11-13 16:21:44 -07:00
MinchinWeb
5a98089522 [Dayone] maintain metadata on edited entries;
Fixes #358, See also #159
2017-11-13 16:21:44 -07:00
MinchinWeb
43df14f18c [Dayone] reverse fd46ffea23
Brings back extended Dayone attributes
2017-11-13 16:21:44 -07:00
MinchinWeb
8721ff819f [Dayone] maintain existing tags stored in Dayone metadata 2017-11-13 16:21:44 -07:00
MinchinWeb
ccaca2d135 [Upgrade] remove unused string parameter 2017-11-13 16:19:16 -07:00
MinchinWeb
a31eb9628a [YAML Export] style improvements 2017-11-13 16:19:16 -07:00
MinchinWeb
cccdc157fb [Dayone] remove extra spaces from the titles of edited DayOne entries
Otherwise, a leading space was being introduced
2017-11-13 16:19:16 -07:00
Radomír Bosák
8615679beb 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
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
Radomír Bosák
6d7bd18d52 Fix behave tests by adding asteval dependency (#469) 2017-03-09 11:56:44 -08:00
Manuel Ebert
2031902f1c Clean up 2016-08-19 23:23:14 +00: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
7776b3d24c Update Cryptography
Fixes SSL issues described in
https://github.com/pyca/cryptography/issues/2750
2016-08-16 11:00:08 +02: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
Manuel Ebert
37f6e3c8b4 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
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
Manuel Ebert
4a871aff32 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
e9d856b039 Update dependencies and lock versions on keyring and cryptography. Fixes #407 2016-02-10 10:24:52 -08: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
659502adf5 Docs on Alfred integration
Fixes #364
2016-01-11 12:17:59 -08:00
Manuel Ebert
155be26840 Doc update on HISTIGNORE
Fixes #394
2016-01-11 12:11:56 -08: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
38682b922f Remove references to jrnl[encrypted] 2015-12-28 21:56:08 -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
d0f86d398f Update tests for templates 2015-07-01 22:23:13 -07:00
Manuel Ebert
dc39a25d5c Support for templates 2015-07-01 22:23:13 -07:00
Manuel Ebert
8a6563d958 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
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