Commit graph

395 commits

Author SHA1 Message Date
William Minchin
623fc076ad Convert from local util.get_local_timezone() to tzlocal.get_localzone()
one side effect is that a `pytz` object is returned rather than a
string, and so conversion to a string must be done explicitly at run
time where needed.
2014-01-29 09:57:15 -07:00
William Minchin
b77a195f23 Fix typos in test files 2014-01-29 09:43:29 -07:00
William Minchin
f5279462b9 require tzlocal version 1.1 or better
jrnl needs the OSX fixes in version 1.1
2014-01-29 09:15:46 -07:00
William Minchin
7f26b6cec5 [Travis-CI] manually install PyCrypto 2014-01-28 16:17:13 -07:00
William Minchin
15ae3857ad Use Travis-CI without requirements.txt 2014-01-28 16:08:22 -07:00
William Minchin
7065cafe01 Just use setup.py
(don't keep a second copy in `requirements.txt`)
2014-01-28 15:20:13 -07:00
William Minchin
95b34e1977 allow newer versions of tzlocal 2014-01-28 15:02:49 -07:00
William Minchin
be856df50e documentation typo fix 2014-01-28 14:37:15 -07:00
Manuel Ebert
071773537b Merge pull request #129 from maebert/fix-argparse
Fix a logic bug so that jrnl -h and jrnl -v are possible even if jrnl no...
2014-01-26 10:22:40 -08:00
Manuel Ebert
9cc37f964f Fix a logic bug so that jrnl -h and jrnl -v are possible even if jrnl not configured yet. 2014-01-26 14:15:46 +01:00
Manuel Ebert
da9be85198 Merge pull request #127 from maebert/pdt1.2
Upgrade to parsedatetime 1.2
2014-01-26 03:47:59 -08:00
Manuel Ebert
99b5d7821d Upgrade to parsedatetime 1.2 2014-01-26 12:37:41 +01:00
Manuel Ebert
872845dadd Statistics ideas 2014-01-26 12:24:54 +01:00
Manuel Ebert
1b72d6b4a1 Fix copyright 2014-01-26 12:05:46 +01:00
Manuel Ebert
e814dd48a8 Updated docs from master 2014-01-26 12:05:46 +01:00
Manuel Ebert
8d5a021eb3 Fixed references to jrnl_conf 2014-01-26 12:05:45 +01:00
Manuel Ebert
b387e56822 Merge pull request #126 from maebert/absolute-imports
Cleaned up imports to work with Python2.6 and Python 3.3
2014-01-23 06:21:42 -08:00
Manuel Ebert
46951cbe12 More unicode support 2014-01-23 15:14:20 +01:00
Manuel Ebert
d35502423a Cleaned up imports to work with Python2.6 and Python 3.3 2014-01-23 14:33:14 +01:00
Manuel Ebert
40c2bc13b5 Merge pull request #125 from maebert/remove-slugify
Port slugify to Python3
2014-01-19 03:13:13 -08:00
Manuel Ebert
19e97d5668 Clean up docs build folder 2014-01-19 12:12:14 +01:00
Manuel Ebert
ff0ac96b4f Remove css from repo 2014-01-19 12:07:04 +01:00
Manuel Ebert
c3d6a38e45 Port slugify to Python3 2014-01-19 11:58:13 +01:00
Manuel Ebert
1304e5ca82 Merge pull request #124 from MinchinWeb/colorama-edit-fixes
Colorama edit fixes (v2)
2014-01-04 06:10:26 -08:00
William Minchin
57785117ab colorama fixes 2014-01-03 10:42:32 -07:00
Manuel Ebert
24147a25af Changelog 2014-01-03 16:02:39 +01:00
Manuel Ebert
480eb4574b Move docs on Windows to FAQ 2014-01-03 15:59:38 +01:00
William Minchin
ea58151395 Windows documentation 2014-01-03 15:55:24 +01:00
Manuel Ebert
03bce74262 Make editing work with templates 2014-01-03 15:52:59 +01:00
Manuel Ebert
3f9d9bf84f Only install colorama on windows 2014-01-03 15:51:27 +01:00
Manuel Ebert
777eb38852 Include dateutil in setup 2014-01-02 23:42:01 +01:00
Manuel Ebert
9d352b4bad Gets rid of colorama 2014-01-02 23:41:53 +01:00
Manuel Ebert
c10cc1fee4 Doc fix 2014-01-02 14:53:32 +01:00
Manuel Ebert
01703af728 Touch tmpfiles before opening 2014-01-02 07:48:57 +01:00
Manuel Ebert
534dc63ec0 Travis fix 2013-12-22 18:50:57 +01:00
Manuel Ebert
25ae0cae7b Makefile update 2013-12-22 18:47:09 +01:00
Manuel Ebert
0ed711230a Dateutil added to requirements. 2013-12-22 18:46:26 +01:00
Manuel Ebert
01ab0fee83 Merge pull request #118 from maebert/develop
Develop
2013-12-22 09:42:14 -08:00
Manuel Ebert
ddae49e053 Smal doc fixes (fixes #115) 2013-12-22 18:26:57 +01:00
Manuel Ebert
91fd821bcc Changelog, dogs 2013-12-22 17:11:32 +01:00
Manuel Ebert
c283a328e0 Tests for #117 2013-12-22 14:52:13 +01:00
Manuel Ebert
67c012a98a Fix for #117 2013-12-22 14:52:06 +01:00
Manuel Ebert
0e637d26d0 DayOne support for --edit 2013-12-21 15:00:26 +01:00
Manuel Ebert
ca6b16a5a1 Cleaner parsing 2013-12-21 14:59:24 +01:00
Manuel Ebert
e4bc0794f1 Modified flag for entries 2013-12-20 16:16:48 +01:00
Manuel Ebert
4d8949bbed Get rid of --delete 2013-12-20 16:16:48 +01:00
Manuel Ebert
fabb8d5f1b Line break 2013-12-02 22:39:34 -08:00
Manuel Ebert
7e6c784556 Version bump 2013-11-30 15:14:53 -08:00
Manuel Ebert
8a8d19477f Subheaders 2013-11-30 15:13:48 -08:00
Manuel Ebert
209228ee6a Docs update 2013-11-30 15:10:34 -08:00