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

1458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aniket Pant
a93e9fff13 Remove default folder config 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-26 13:04:50 +05:30
Aniket Pant
d91165c946 Fix changelog 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-26 11:20:58 +05:30
Aniket Pant
c9d5e13667 Merge master and fix merge conflict 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-26 11:19:10 +05:30
Manuel Ebert
20fb701a1a Addresses unicode issues in Python 3 
Fixes #79
 2013-06-24 15:54:04 +02:00
Aniket Pant
15a7f21eb1 Update changelog 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:23:54 +05:30
Aniket Pant
b03c8fa039 Update version to 1.1.1 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:23:46 +05:30
Aniket Pant
3207dd10aa Update readme 
Information on new export options added

Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:23:27 +05:30
Aniket Pant
1c5a42d46e Add slugify to requirements 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:22:28 +05:30
Aniket Pant
a38d9df473 Add new export option 
Support for json and md retained
All export types moved to --export except tags

Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:22:02 +05:30
Aniket Pant
7e1b5316aa Add default export folder config 
Signed-off-by: Aniket Pant <me@aniketpant.com>
 2013-06-21 19:20:57 +05:30
Manuel Ebert
d48a03a00e Allow python 3 to fail on travis 2013-06-09 16:04:17 -07:00
Manuel Ebert
e94755d556 Typo 2013-06-09 15:59:49 -07:00
Manuel Ebert
3e240ebfe0 Changelog cleanup 2013-06-09 15:59:11 -07:00
Manuel Ebert
9852f227b7 Better Unicode support 
Closes #72
 2013-06-09 15:55:03 -07:00
Manuel Ebert
73b09085ee Moves tag export to exporters 2013-06-09 15:07:27 -07:00
Manuel Ebert
90863ecee1 Nicer error message when there is a syntactical error in your config file. 2013-06-09 14:49:02 -07:00
Manuel Ebert
ac7a882142 JSON exports tags 
Closes #78. This changes the export format to

{
tags: {tag: count},
entries: [{…}, {…}, …]
}
 2013-06-09 14:48:56 -07:00
Manuel Ebert
992beb393e Disables PyICU use for now until proper localization is implemented. 
Fixes #52
 2013-05-08 10:08:48 -07:00
Manuel Ebert
8cedf04b0a Backwards compatibility with parsedatetime 0.8.7 
Closes #76
 2013-05-08 09:56:49 -07:00
Manuel Ebert
800c89543f Fixes double readline import 
Should finally fix #71
 2013-04-23 16:29:32 -07:00
Manuel Ebert
897ba57783 Formatting 2013-04-23 09:13:06 -07:00
Manuel Ebert
7fda109e55 Conditional import for pyreadline 
Fixes #71
 2013-04-23 09:13:00 -07:00
Manuel Ebert
3c07c7dee0 pycrypto back to extras. 
Fixes 68
 2013-04-22 09:58:45 +02:00
Manuel Ebert
4a94705b25 Merge pull request #70 from okin/master 
Make the cli work again.
 2013-04-22 00:14:34 -07:00
Niko Wenselowski
a3ea62333e Make the cli work again. 2013-04-21 22:03:49 +02:00
Manuel Ebert
cb77ebc81b Build status 2013-04-19 17:58:07 +02:00
Manuel Ebert
884881546d Better utf8 support 2013-04-19 17:32:32 +02:00
Manuel Ebert
8842b8589f Updated readme and changelog and changed config path according to discussion 2013-04-19 16:58:19 +02:00
Manuel Ebert
02da463f10 Merge branch 'patch-1' of git://github.com/evaryont/jrnl into evaryont-patch-1 2013-04-19 16:50:27 +02:00
Manuel Ebert
634d84c77e Fixes for Python 3 Support 2013-04-19 15:19:21 +02:00
Manuel Ebert
3052e0cce7 Python 3 compatibility 2013-04-19 14:46:05 +02:00
Manuel Ebert
cf720732b2 Experimental build settings for travis 2013-04-18 11:52:53 +02:00
Manuel Ebert
5b4b1e71d6 Python 2.6 compatibility 
Closes #67
 2013-04-18 11:51:42 +02:00
Manuel Ebert
65b4d5ffa0 Fixes install routine 2013-04-17 12:02:26 +02:00
Manuel Ebert
65aff0d75e Fixes readline support on windows 
Closes #60
 2013-04-17 10:50:03 +02:00
Manuel Ebert
c92339e4e2 Merge pull request #61 from alapolloni/master 
Update jrnl.py so that a trailing / for a DayOne journal config is seen as a DayOne journal.
 2013-04-17 01:32:56 -07:00
Manuel Ebert
dfba03d127 Fixes bug when showing tags when no tags are defined. 
Closes #63
 2013-04-17 10:27:17 +02:00
Manuel Ebert
a8958e7b0d Automatic versioning 2013-04-17 10:19:38 +02:00
Manuel Ebert
ba6f7a43ba Makes PyCrypto an automatic install 2013-04-17 10:19:25 +02:00
Manuel Ebert
e0f7d235b1 Uses colorama instead of clint 2013-04-17 10:19:02 +02:00
Alex Apolloni
06e664d78a allow trailing \ for DayOne journals 
https://github.com/maebert/jrnl#dayone-integration
sort of infers that it in the .jrnl_config it should end in a /

but prior to this, if there was a trailing / then jrnl thought it was
looking at a text type journal.
 2013-04-15 14:05:04 +02:00
No GUI
b66480ff1d Support a custom location for the config 
Export $JRNL_CONFIG to override the location instead of using $HOME. Too many dotfiles are literring it, ya' know?

Linux desktop users, you might like if you follow the XDG standards:

    export JRNL_CONFIG=$XDG_CONFIG_HOME/jrnl/config
 2013-04-14 13:19:03 -07:00
Manuel Ebert
f79f7cf849 Merge pull request #56 from notbalanced/master 
Fixes issue where entry is split into title and body at decimal points in numbers.
 2013-03-29 13:47:59 -07:00
Craig Moyer
ff722417db Fix issue where embedded decimal in title causes title to get cut off. 2013-03-28 21:31:08 -04:00
Manuel Ebert
165d9b2d8d Fixes typos in readme 2013-03-13 00:51:24 -07:00
Manuel Ebert
fb94c816f7 Version bump 2013-03-12 13:30:24 -07:00
Manuel Ebert
6af77a0b10 Requires current version of parsedatime when using setuptools 
Closes #52
 2013-03-12 13:29:10 -07:00
Manuel Ebert
151b0d8e34 Changelog updated 2013-03-04 15:49:59 -08:00
Manuel Ebert
95e828e643 Version bump to 1.0.0 ⭐ 2013-03-04 14:58:02 -08:00
Manuel Ebert
61835d88ec Merge pull request #51 from maebert/dayone 
Dayone support
 2013-03-04 14:57:10 -08:00