Commit graph

835 commits

Author SHA1 Message Date
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
MinchinWeb
b880a3856b Include plugins in eggs 2015-04-19 23:19:35 -06:00
MinchinWeb
7e21472e2d grr...fix typo 2015-04-14 16:55:06 -06:00
MinchinWeb
8d46ddac46 Make the tests pass 2015-04-14 16:49:49 -06:00
MinchinWeb
287d9e3798 Merge branch '2.0-rc1-markdown-export-fix' of https://github.com/MinchinWeb/jrnl into 2.0-rc1-markdown-export-fix 2015-04-14 16:06:57 -06:00
MinchinWeb
aacccb716d Update .gitignore 2015-04-14 15:58:56 -06:00
MinchinWeb
0d44bcb41e Check for heading level error 2015-04-14 15:58:55 -06:00
MinchinWeb
39909954dc Check for heading level error 2015-04-14 15:52:18 -06:00
MinchinWeb
5d768ad25c Add YAML export 2015-04-14 15:49:58 -06:00
MinchinWeb
f1a83a51ed Add testing for increasing Headings on Markdown export 2015-04-14 15:13:00 -06:00
MinchinWeb
1d3c9daafe Don't relay on colorama for ANSI color codes 2015-04-14 14:07:08 -06:00
MinchinWeb
96cafb3ef2 Warn if increasing headings goes past H6
Only warn once per entry.
2015-04-14 13:45:50 -06:00
MinchinWeb
defd81631b Increase heading levels on Markdown export 2015-04-14 13:28:03 -06:00
MinchinWeb
6cdf2f90c5 Change heading levels on Markdown export depending on if it is to a consolidated file or to individual files. 2015-04-14 12:25:22 -06:00
MinchinWeb
725257ca3d Removes leading 'b' on slugs in Python 3 2015-04-14 12:04:36 -06:00
MinchinWeb
9950cfecbb Update Tag exporter code documentation. 2015-04-14 11:59:15 -06:00
MinchinWeb
9ba557c0d3 Update Markdown exporter documentation. 2015-04-14 11:38:24 -06:00
MinchinWeb
95d920b0bf Unable to run cli.py as a standalone script due to relative imports 2015-04-14 11:07:56 -06:00
MinchinWeb
6c9aa9df8c Don't pin to a specific version of cryptography 2015-04-14 10:41:28 -06:00
Thijs van Dijk
354cc3244c Fix improper charset handling in PY2 path of u(x)
Knowing fully that I may have just added another layer of impropriety, the above line fixed the charset errors I was getting.

I'll illustrate this change with an example string `Charšet`, entered (e.g. through stdin) in UTF-8 encoding.
To the best of my knowledge, the previous version would first have encoded this string to `Char\xc5\xa1et` (i.e., it encoded each byte not in ascii range as a hex escape code), and then have parsed this string to `Charšet` (i.e. after "r" it sees Unicode code point U+00c5 and U+00a1).

My version simply takes this str for what it is: an UTF-8 representation of the unicode string `Charšet`.
2015-04-14 11:52:10 +02:00
flight16
a212e86503 Fix breaking test submitted in ebee196444. 2015-04-13 23:23:54 +09:00
flight16
ebee196444 Add single letter alias -s for option --short
--short was being used in a test for date logic, but I added a second
test for explicitness.
2015-04-13 09:08:43 +09:00
flight16
9825f16310 Fix: dateutil conflict because python-dateutils was already added to the conditional section. 2015-04-13 09:01:10 +09:00
flight16
53e3bd334c Merge remote-tracking branch 'maebert/2.0-rc1' into 2.0-rc1
Conflicts:
	setup.py
2015-04-13 08:46:43 +09:00
flight16
763a05a945 Add missing dependencies pyyaml and pyxdg 2015-04-11 13:03:15 +09:00
Manuel Ebert
bf7ece8208 TXT extension for temp files 2015-04-05 23:55:04 +02:00
Manuel Ebert
539a88ed14 Tests for parsing issue fix 2015-04-05 18:38:37 +02:00
Manuel Ebert
b4e578b63a Fix parsing issue 2015-04-05 18:38:30 +02:00
Manuel Ebert
6c18b6f3b4 More encoding madness 2015-04-05 06:38:38 +04:00
Manuel Ebert
4a7a8cb7a4 Encryption reads and writes in binary mode 2015-04-05 06:14:18 +04:00
Manuel Ebert
76c9006ed3 Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
bad5582632 Bilingual meta classes 2015-04-05 05:50:30 +04:00
Manuel Ebert
6e52b5eb70 Tests for #333 2015-04-05 03:27:09 +04:00
Manuel Ebert
aae0fc21b6 Export DayOne UUID in json
Fixes #333
2015-04-05 03:26:52 +04:00
Manuel Ebert
c508e0c574 Update all tests to new time format 2015-04-05 03:25:39 +04:00