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
1019 commits 10 branches 99 tags 14 MiB
Commit graph

1019 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
18d46417f1 Fix conflicting requirements 
Fixes #296
 2015-04-05 02:27:47 +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
Manuel Ebert
1a65ae57cb Merge pull request #306 from pcarranza/2.0-r1-logging 
Added basic logging feature to understand how is configuration loaded
 2014-11-10 11:53:14 +01: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
Manuel Ebert
3024f2ba46 Merge pull request #299 from gcgoogle/fix-hard-coded-export-type-list 
Now the list of export types in --help is generated from the plugins.
 2014-10-30 15:01:32 +01:00
Gregory Crosswhite
324dfbd2db Now the importer reads from standard input using util.py23_read(). 2014-10-29 13:02:11 -07:00