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

399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manuel Ebert
1a6c9aa74a Changelog and docs 2014-02-05 10:19:01 -08:00
Manuel Ebert
5b5a5d9f57 Allows -3 as a shortcut for -n 3 2014-02-05 10:16:40 -08:00
Manuel Ebert
1d574c7407 Clean up 2014-01-29 16:54:53 -08:00
Manuel Ebert
d900b239a9 Merge pull request #130 from MinchinWeb/update-tzlocal 
Update tzlocal
 2014-01-29 16:49:14 -08:00
William Minchin
ca7a804b09 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
9e5664ba46 Fix typos in test files 2014-01-29 09:43:29 -07:00
William Minchin
a20381ce68 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
a26fd3d1d7 [Travis-CI] manually install PyCrypto 2014-01-28 16:17:13 -07:00
William Minchin
3a4607f671 Use Travis-CI without requirements.txt 2014-01-28 16:08:22 -07:00
William Minchin
6f302ad664 Just use setup.py 
(don't keep a second copy in `requirements.txt`)
 2014-01-28 15:20:13 -07:00
William Minchin
f1e5c88b23 allow newer versions of tzlocal 2014-01-28 15:02:49 -07:00
William Minchin
5ff185b2df documentation typo fix 2014-01-28 14:37:15 -07:00
Manuel Ebert
81b684afdf 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
fc72514434 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
1e4506803b Merge pull request #127 from maebert/pdt1.2 
Upgrade to parsedatetime 1.2
 2014-01-26 03:47:59 -08:00
Manuel Ebert
cebe33574d Upgrade to parsedatetime 1.2 2014-01-26 12:37:41 +01:00
Manuel Ebert
7b630fb65e Statistics ideas 2014-01-26 12:24:54 +01:00
Manuel Ebert
60bcac8d55 Fix copyright 2014-01-26 12:05:46 +01:00
Manuel Ebert
b88180fbce Updated docs from master 2014-01-26 12:05:46 +01:00
Manuel Ebert
ea70ac713f Fixed references to jrnl_conf 2014-01-26 12:05:45 +01:00
Manuel Ebert
7599688dba 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
6c51374f08 More unicode support 2014-01-23 15:14:20 +01:00
Manuel Ebert
ab9a3b5192 Cleaned up imports to work with Python2.6 and Python 3.3 2014-01-23 14:33:14 +01:00
Manuel Ebert
382917b8c4 Merge pull request #125 from maebert/remove-slugify 
Port slugify to Python3
 2014-01-19 03:13:13 -08:00
Manuel Ebert
816aa66356 Clean up docs build folder 2014-01-19 12:12:14 +01:00
Manuel Ebert
4f7827fc91 Remove css from repo 2014-01-19 12:07:04 +01:00
Manuel Ebert
6c9687110c Port slugify to Python3 2014-01-19 11:58:13 +01:00
Manuel Ebert
92867a2f84 Merge pull request #124 from MinchinWeb/colorama-edit-fixes 
Colorama edit fixes (v2)
 2014-01-04 06:10:26 -08:00
William Minchin
447fb4d59f colorama fixes 2014-01-03 10:42:32 -07:00
Manuel Ebert
d4a1a10880 Changelog 2014-01-03 16:02:39 +01:00
Manuel Ebert
a0828ef151 Move docs on Windows to FAQ 2014-01-03 15:59:38 +01:00
William Minchin
57e926aaaa Windows documentation 2014-01-03 15:55:24 +01:00
Manuel Ebert
26878883dd Make editing work with templates 2014-01-03 15:52:59 +01:00
Manuel Ebert
f0aab36e19 Only install colorama on windows 2014-01-03 15:51:27 +01:00
Manuel Ebert
b050f2b030 Include dateutil in setup 2014-01-02 23:42:01 +01:00
Manuel Ebert
fcd8c4d214 Gets rid of colorama 2014-01-02 23:41:53 +01:00
Manuel Ebert
c3e8f59fe0 Doc fix 2014-01-02 14:53:32 +01:00
Manuel Ebert
77b669aedf Touch tmpfiles before opening 2014-01-02 07:48:57 +01:00
Manuel Ebert
860d74bc0e Travis fix 2013-12-22 18:50:57 +01:00
Manuel Ebert
cdf312de28 Makefile update 2013-12-22 18:47:09 +01:00
Manuel Ebert
a4448b0c34 Dateutil added to requirements. 2013-12-22 18:46:26 +01:00
Manuel Ebert
8c9ae82b98 Merge pull request #118 from maebert/develop 
Develop
 2013-12-22 09:42:14 -08:00
Manuel Ebert
e0ef258a83 Smal doc fixes (fixes #115) 2013-12-22 18:26:57 +01:00
Manuel Ebert
9df688d6f0 Changelog, dogs 2013-12-22 17:11:32 +01:00
Manuel Ebert
d34874947f Tests for #117 2013-12-22 14:52:13 +01:00
Manuel Ebert
077bff7e88 Fix for #117 2013-12-22 14:52:06 +01:00
Manuel Ebert
fa130143b5 DayOne support for --edit 2013-12-21 15:00:26 +01:00
Manuel Ebert
88db6fca23 Cleaner parsing 2013-12-21 14:59:24 +01:00
Manuel Ebert
c06bfd781f Modified flag for entries 2013-12-20 16:16:48 +01:00
Manuel Ebert
410e4299ea Get rid of --delete 2013-12-20 16:16:48 +01:00