Radomír Bosák
9d90d088e3
Add ability to search in entry title and body
...
jrnl was missing ability to search in entry titles and message bodies.
This commit adds a '-search TEXT' option which, if specified, causes
jrnl to display only those entries which have 'TEXT' in either their
title or message body.
Specifying the '-search' option also implies that the compose mode
won't be used.
Fixes #384 .
2017-03-10 18:55:26 +01: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
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
ea6060d75c
Fix that goddamn timezone test
2015-04-21 16:34:27 +02:00
Manuel Ebert
bedab7c121
Fix for #332
2015-04-21 15:57:44 +02:00
