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

696 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MinchinWeb
162e33089e grr...fix typo 2015-04-14 16:55:06 -06:00
MinchinWeb
7d23945df7 Make the tests pass 2015-04-14 16:49:49 -06:00
MinchinWeb
2caaa039b1 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
0a730f2a94 Update .gitignore 2015-04-14 15:58:56 -06:00
MinchinWeb
087b45f0bf Check for heading level error 2015-04-14 15:58:55 -06:00
MinchinWeb
dbfc61b437 Check for heading level error 2015-04-14 15:52:18 -06:00
MinchinWeb
f182dae6eb Add YAML export 2015-04-14 15:49:58 -06:00
MinchinWeb
2d49aaa1a0 Add testing for increasing Headings on Markdown export 2015-04-14 15:13:00 -06:00
MinchinWeb
442e27a5d1 Don't relay on colorama for ANSI color codes 2015-04-14 14:07:08 -06:00
MinchinWeb
8e44ce0845 Warn if increasing headings goes past H6 
Only warn once per entry.
 2015-04-14 13:45:50 -06:00
MinchinWeb
c10a4d4fed Increase heading levels on Markdown export 2015-04-14 13:28:03 -06:00
MinchinWeb
429c8283e0 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
f1641d8084 Removes leading 'b' on slugs in Python 3 2015-04-14 12:04:36 -06:00
MinchinWeb
141eb2a647 Update Tag exporter code documentation. 2015-04-14 11:59:15 -06:00
MinchinWeb
bbbc2de1b4 Update Markdown exporter documentation. 2015-04-14 11:38:24 -06:00
MinchinWeb
3b85121f51 Unable to run cli.py as a standalone script due to relative imports 2015-04-14 11:07:56 -06:00
MinchinWeb
873356b623 Don't pin to a specific version of cryptography 2015-04-14 10:41:28 -06:00
Thijs van Dijk
c68a60f6dc 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
35b9827eb1 Fix breaking test submitted in b2a7d1f30e. 2015-04-13 23:23:54 +09:00
flight16
b2a7d1f30e 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
00a5657c1b Fix: dateutil conflict because python-dateutils was already added to the conditional section. 2015-04-13 09:01:10 +09:00
flight16
6bcd5be7d4 Merge remote-tracking branch 'maebert/2.0-rc1' into 2.0-rc1 
Conflicts:
	setup.py
 2015-04-13 08:46:43 +09:00