fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
719 commits 10 branches 99 tags 14 MiB
Commit graph

719 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MinchinWeb
e0177f4f0b Fixes #348 
Also fixes #322 on windows.
 2015-05-05 11:58:15 -06:00
MinchinWeb
7de37ffd25 code formatting 2015-05-04 12:08:05 -06:00
MinchinWeb
0fcf078c1c [Dayone] Add Creator section to dayone import and YAML export 2015-05-04 00:21:33 -06:00
MinchinWeb
91368c7b63 [Util] delete old, unused code 2015-05-03 22:12:10 -06:00
MinchinWeb
cf7b5d95eb [CLI] colour code 'no editor' error message 2015-05-03 21:59:20 -06:00
MinchinWeb
db4a5a4665 [YAML export] remove lines that simply list tags 2015-05-03 21:36:16 -06:00
MinchinWeb
327fde5c0f [YAML export] only increase headings by one level 2015-05-03 19:56:16 -06:00
Manuel Ebert
3408440705 Fix that goddamn timezone test 2015-04-21 16:34:27 +02:00
Manuel Ebert
bf2cdc4995 Fix for #332 2015-04-21 15:57:44 +02:00
Manuel Ebert
07fbf73dee Fix for #322 2015-04-21 15:49:27 +02:00
Manuel Ebert
ca76077e09 Merge branch 'pr/326' into 2.0-rc1 2015-04-20 14:59:47 +02:00
Gregory Crosswhite
60194c7043 Now the list of import types in --help is generated from the plugins. 2015-04-20 14:57:33 +02:00
Gregory Crosswhite
cd390ad2ab 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
7c3586bbde Add documentation on advanced editor config 2015-04-20 14:45:24 +02:00
Josh Davis
47aa63c64a Allow editor config value to be either list or str 2015-04-20 14:45:15 +02:00
Manuel Ebert
4f23169d4e 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
19247a4f62 Remove ; 2015-04-20 14:36:53 +02:00
MinchinWeb
34d437d0ba Fix weird character at the front of the line... 2015-04-20 14:36:35 +02:00
MinchinWeb
b3ed4926f4 Name file handle if we're going to us it 
Conflicts:
	jrnl/util.py
 2015-04-20 14:36:12 +02:00
Craig Moyer
01a7f660f3 Close temp file before deleting it. 2015-04-20 14:35:31 +02:00
Manuel Ebert
0d1b381bd1 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
c4b16b7577 Warn user if attempting to write to default journal but not configured 
Fixes #343
 2015-04-20 14:25:44 +02:00
Manuel Ebert
9bf4e52b2c Tests for #343 2015-04-20 14:25:20 +02:00
Manuel Ebert
8e7126a4b7 Merge branch 'pr/342' into 2.0-rc1 2015-04-20 14:15:57 +02:00
Manuel Ebert
0a197365e2 Consolidate requirements 2015-04-20 14:15:48 +02:00
Manuel Ebert
22ae53407e Split tests 2015-04-20 14:13:34 +02:00
Manuel Ebert
f1907bd27d Fix test arg parsing 2015-04-20 14:12:34 +02:00