Commit graph

768 commits

Author SHA1 Message Date
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
Manuel Ebert
eb0af8f47c Fix for #322 2015-04-21 15:49:27 +02:00
Manuel Ebert
924037e2b0 Merge branch 'pr/326' into 2.0-rc1 2015-04-20 14:59:47 +02:00
Gregory Crosswhite
70c1f8c2ed Now the list of import types in --help is generated from the plugins. 2015-04-20 14:57:33 +02:00
Gregory Crosswhite
61f1d866b3 Add jrnl.plugins to the list of installed packages.
Without this the installed jrnl will not run.

Conflicts:
	setup.py
2015-04-20 14:56:18 +02:00
Josh Davis
308fe0d478 Add documentation on advanced editor config 2015-04-20 14:45:24 +02:00
Josh Davis
61cc792ad7 Allow editor config value to be either list or str 2015-04-20 14:45:15 +02:00
Manuel Ebert
5a3e3320a7 Merge pull request #346 from ametheus/patch-2
Fix improper charset handling in PY2 path of u(x)
2015-04-20 14:42:41 +02:00
Manuel Ebert
e88fa16bbc Remove ; 2015-04-20 14:36:53 +02:00
MinchinWeb
d17558f3c6 Fix weird character at the front of the line... 2015-04-20 14:36:35 +02:00
MinchinWeb
425ecf791d Name file handle if we're going to us it
Conflicts:
	jrnl/util.py
2015-04-20 14:36:12 +02:00
Craig Moyer
ee782cc5c5 Close temp file before deleting it. 2015-04-20 14:35:31 +02:00
Manuel Ebert
94d6ebeb2d Merge pull request #347 from MinchinWeb/2.0-rc1-markdown-export-fix
2.0 rc1 markdown export fix
2015-04-20 14:29:17 +02:00
Manuel Ebert
4b70709248 Warn user if attempting to write to default journal but not configured
Fixes #343
2015-04-20 14:25:44 +02:00
Manuel Ebert
978d735351 Tests for #343 2015-04-20 14:25:20 +02:00
Manuel Ebert
57ef796ccb Merge branch 'pr/342' into 2.0-rc1 2015-04-20 14:15:57 +02:00
Manuel Ebert
10eb36076f Consolidate requirements 2015-04-20 14:15:48 +02:00
Manuel Ebert
08fbd0d960 Split tests 2015-04-20 14:13:34 +02:00
Manuel Ebert
bdfe588a01 Fix test arg parsing 2015-04-20 14:12:34 +02:00
MinchinWeb
a2c75e180c Include plugins in eggs 2015-04-19 23:19:35 -06:00