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

739 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
flight16
41bec199a2 Add missing dependencies pyyaml and pyxdg 2015-04-11 13:03:15 +09:00
Manuel Ebert
8e627b01c0 TXT extension for temp files 2015-04-05 23:55:04 +02:00
Manuel Ebert
b41b5d3376 Tests for parsing issue fix 2015-04-05 18:38:37 +02:00
Manuel Ebert
cca630059f Fix parsing issue 2015-04-05 18:38:30 +02:00
Manuel Ebert
c720c15787 More encoding madness 2015-04-05 06:38:38 +04:00
Manuel Ebert
109a11d18e Encryption reads and writes in binary mode 2015-04-05 06:14:18 +04:00
Manuel Ebert
94964dc31c Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
b7d8e1a9a5 Bilingual meta classes 2015-04-05 05:50:30 +04:00
Manuel Ebert
f459dd5bc2 Tests for #333 2015-04-05 03:27:09 +04:00
Manuel Ebert
1543a93799 Export DayOne UUID in json 
Fixes #333
 2015-04-05 03:26:52 +04:00
Manuel Ebert
812d289740 Update all tests to new time format 2015-04-05 03:25:39 +04:00
Manuel Ebert
4010d38af2 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
7dc2ccbd3a Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
367b13b849 Fix conflicting requirements 
Fixes #296
 2015-04-05 02:27:47 +04:00
Manuel Ebert
24ada92787 Upgrade old time stamps to fix #317 2015-04-05 02:23:10 +04:00
Manuel Ebert
9c7d5af152 Legacy Journal with old timestamps 2015-04-05 02:23:09 +04:00
Manuel Ebert
f68ca1221e Cuddle timestamp in brackets to fix #318 2015-04-05 02:22:49 +04:00
Manuel Ebert
c31e62d9d6 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
75ecc0dbbd Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
4955902702 Return config after install 
Fixes #297
 2015-04-04 18:47:09 +11:00
Manuel Ebert
b90a4b16bb Make backup of config when upgrading 
Fixes #307
 2015-04-04 18:36:34 +11:00
Manuel Ebert
dd79639095 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Manuel Ebert
15ef9749ae Merge pull request #325 from nikvdp/master 
Correct issue #259, also fix issue with specifying DayOne journals in install
 2015-01-11 08:50:24 -08:00
Manuel Ebert
205269ae44 Merge pull request #310 from dedan/patch-2 
fix small typo
 2014-12-18 10:37:07 +07:00
Nik V
d0e49d2c72 Don't die if you specify a directory (DayOne journal) to install 2014-12-11 21:28:04 +08:00
Nik V
28c994fce1 Fix bug with dayone journals on linux 2014-12-11 21:21:18 +08:00
Manuel Ebert
17833c0df6 Merge pull request #321 from seinfield/master 
corrects issue #316
 2014-12-08 13:39:36 +07:00
seinfield
5d9cd1c324 corrected typo 2014-12-07 03:00:41 -05:00
seinfield
53c9663bb9 corrects issue #316 2014-12-07 02:55:49 -05:00
Manuel Ebert
511952e203 Icon update! 2014-11-29 18:36:42 +07:00
Stephan Gabler
6c390dafb4 fix small typo 2014-11-19 14:26:13 +01:00
Manuel Ebert
49b9e796c4 Merge pull request #309 from maebert/tmpfile-fix 
Fixes #308
 2014-11-17 15:46:45 +01:00
Manuel Ebert
e3329716c1 Fixes #308 2014-11-17 15:36:43 +01:00
Manuel Ebert
003fb507ae 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
cc22fd8e60 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
1046c18857 Merge pull request #305 from pcarranza/debug-flag 
Added basic logging feature to understand how is configuration loaded
 2014-11-09 10:51:03 +01:00
Pablo Carranza
2511785dd4 Added exception info to the output when it cannot be loaded 2014-11-06 19:15:11 -05:00
Pablo Carranza
155b8e8f72 Added basic logging feature to understand how is configuration loaded 2014-11-06 15:36:03 -05:00
Manuel Ebert
fbecc6d062 Travis update 2014-11-06 12:38:57 +01:00
Manuel Ebert
1b98b3a3e5 github_release plug on setup.py 2014-11-06 12:35:31 +01:00
Manuel Ebert
3227c92e30 Merge pull request #304 from maebert/unicode-fixes 
Unicode fixes
 2014-11-06 11:33:36 +01:00
Manuel Ebert
33cb12d64f version bump 2014-11-06 11:30:15 +01:00