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

558 commits

Author SHA1 Message Date
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
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
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
MinchinWeb
5d768ad25c Add YAML export 2015-04-14 15:49:58 -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
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
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
Manuel Ebert
bf7ece8208 TXT extension for temp files 2015-04-05 23:55:04 +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
aae0fc21b6 Export DayOne UUID in json 
Fixes #333
 2015-04-05 03:26:52 +04:00
Manuel Ebert
54f8382450 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
b8ef404453 Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
b37cefbea1 Upgrade old time stamps to fix #317 2015-04-05 02:23:10 +04:00
Manuel Ebert
5ffd0d5d0b Legacy Journal with old timestamps 2015-04-05 02:23:09 +04:00
Manuel Ebert
57007a8266 Cuddle timestamp in brackets to fix #318 2015-04-05 02:22:49 +04:00
Manuel Ebert
a5f08e6081 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
df82ad1f4d Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
cc85d905ca Return config after install 
Fixes #297
 2015-04-04 18:47:09 +11:00
Manuel Ebert
c0ec95679b Make backup of config when upgrading 
Fixes #307
 2015-04-04 18:36:34 +11:00
Manuel Ebert
2615070df0 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Pablo Carranza
640d426b71 Added basic logging feature to understand how is configuration loaded 
Conflicts:

	jrnl/cli.py
	jrnl/util.py
 2014-11-09 15:55:52 -05:00
Manuel Ebert
163dc04481 Merge pull request #300 from gcgoogle/add-import-plugin-support 
Added support for importing entries for 2.0rc1.
 2014-10-30 15:03:47 +01:00
Gregory Crosswhite
324dfbd2db Now the importer reads from standard input using util.py23_read(). 2014-10-29 13:02:11 -07:00
Gregory Crosswhite
93ea6a2a6a Made Journal.import_ more concise. 2014-10-29 13:02:05 -07:00