Commit graph

704 commits

Author SHA1 Message Date
Jonathan Wren
07bfe7f24f
Merge pull request #14 from wren/contributing-13
[GH-13] Update contributing
2019-06-22 16:02:40 -07:00
micahellison
99c3075965
Merge pull request #12 from micahellison/readme
[GH-1] updating readme
2019-06-22 15:59:05 -07:00
Jonathan Wren
77748ddd86 update contributing file 2019-06-22 15:54:38 -07:00
Micah Jerome Ellison
01a2956c04 [GH-1] fussing with author text 2019-06-22 15:13:51 -07:00
Micah Jerome Ellison
7bd770187c [GH-1] adding build badge back in 2019-06-22 15:05:26 -07:00
Micah Jerome Ellison
966e7f26cf [GH-1] updating readme to mention fork, instability 2019-06-22 14:57:20 -07:00
Jonathan Wren
18413b1887
Merge pull request #11 from wren/travis-badges-3
#3 Update build badges
2019-06-22 14:52:53 -07:00
Jonathan Wren
09bdf5ab70 [GH-3] update build badges 2019-06-22 14:47:40 -07:00
micahellison
0ba518cf1e
Merge pull request #8 from micahellison/travis-tests
#5, #6 fixing failing tests
2019-06-22 14:39:15 -07:00
Micah Jerome Ellison
d413a6b7e6 #6 allowing template interpreter to interpret common Python commands 2019-06-22 14:35:27 -07:00
Micah Jerome Ellison
2a401823b5 #5 Removing DayOne tests 2019-06-22 14:35:27 -07:00
Jonathan Wren
324022cde9
Merge pull request #10 from wren/tests-ci-9
#9 Update Python version for CI
2019-06-22 14:32:04 -07:00
Jonathan Wren
efd674aa34 update python version for ci 2019-06-22 14:28:54 -07:00
Jonathan Wren
60fbfa793b test commit directly to master 2019-06-22 13:06:03 -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
Emma Humphries
6baf8e389e Add instructions for VS Code (#544) 2018-06-26 11:28:23 -07:00
Jenny Li
16f3637b8e minor typo fixes (#515) 2018-02-16 14:35:47 -08: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