Commit graph

434 commits

Author SHA1 Message Date
William Minchin
92258f0b08 Merge remote-tracking branch 'upstream/master' into parse-dates 2014-03-28 13:46:31 -06:00
Manuel Ebert
599c5a9ea1 More unicode fixes for #119 2014-03-27 16:12:03 -07:00
Manuel Ebert
f72b10700d Merge pull request #146 from maebert/fix-whitespaces
Fix whitespaces
2014-03-24 11:07:09 -07:00
Manuel Ebert
040c09dbd4 Changelog & version bump 2014-03-24 10:48:57 -07:00
Manuel Ebert
aa70bb3274 Fixes white spaces at the beginning of lines, fixes #134 2014-03-24 10:48:51 -07:00
Manuel Ebert
e2111ff209 Merge pull request #145 from maebert/unicode-fix
Unicode fix for DayOne journals
2014-03-24 09:42:16 -07:00
Manuel Ebert
9ba6b71a61 Changelog & version bump 2014-03-24 08:46:20 -07:00
Manuel Ebert
4d4a85b4b8 Small fix for unicode in DayOne, fixes #119 2014-03-24 08:45:48 -07:00
Manuel Ebert
bdb77d488d Makefile update 2014-03-19 15:24:33 -07:00
Manuel Ebert
ed43ae9bc4 Version bump 2014-03-19 15:21:52 -07:00
Manuel Ebert
4f55e895bc Merge pull request #143 from maebert/dayone-tag-search
Adds the tag symbol to day one entries on load
2014-03-19 15:20:02 -07:00
Manuel Ebert
d5496467cf Tests for filtering by tags 2014-03-19 15:00:56 -07:00
Manuel Ebert
f03d7a3bf9 Adds the tag symbol to day one entries on load 2014-03-19 14:44:47 -07:00
Manuel Ebert
887c7027b2 Merge pull request #138 from jtan189/master
Added ability to list accessible journals.
2014-02-23 21:02:35 -08:00
Josh Tan
36601cba39 Simplified syntax for joining journal names with new lines. 2014-02-23 22:46:28 -06:00
Josh Tan
f1ea01ff9a Added ability to list accessible journals.
Previously, if a user forgot the exact name of a journal, they could check the configuration file to retrieve this information. This patch adds support for performing this task using the jrnl interface.

The newly added '-ls' option retrieves the available journals from the jrnl configuration files and displays each journal name on a separate line.

This patch also updates the jrnl help display and the usage documentation to reflect these changes.
2014-02-23 22:21:54 -06:00
Manuel Ebert
f504e2a61c Merge pull request #139 from maebert/argparse-fix
Flexible argparse for 2.6
2014-02-23 20:13:47 -08:00
Manuel Ebert
27c261943c Flexible argparse for 2.6 2014-02-23 20:10:31 -08:00
Manuel Ebert
ec3751ccc0 Merge pull request #132 from MinchinWeb/line-wrap
Linewrap fixes
2014-02-17 11:27:42 -08:00
William Minchin
e042e8f058 Drop text to lowercase for replacements 2014-02-10 13:56:57 -07:00
William Minchin
797a8b143e Split out (failing) test
These tests have a date with a period in it
2014-02-10 13:56:38 -07:00
William Minchin
9652575928 deal with months
allow `-to` and `-from` to work on bare months; also if just a month is
given for an entry, assume the default time on the 1st of the month.
2014-02-10 13:24:42 -07:00
William Minchin
b0a29736d7 String replacement to deal with more dates
deals with `tues`, `thurs`, `sept`, and ` o'clock`
2014-02-08 15:29:54 -07:00
William Minchin
aede53a9f4 Fix dealing with plain years
`-from` and `-to` flags also work
2014-02-08 14:40:49 -07:00
William Minchin
da28dc9249 speling 2014-02-08 14:18:36 -07:00
William Minchin
8388198eae Note how jrnl deals with dates without a year 2014-02-08 14:15:14 -07:00
William Minchin
5226d82c54 Skip Work in Progress tests 2014-02-08 13:14:01 -07:00
William Minchin
65aae7e0be Expand date tests
of the 93 tests added, it passes 47
2014-02-08 13:08:38 -07:00
William Minchin
4df237589b Add date tests
but don't have Travis-CI run them yet
2014-02-08 10:54:02 -07:00
William Minchin
69dafdc39b Remove parse-date-test.py 2014-02-07 10:35:35 -07:00
William Minchin
dd91d7a491 add 'from' and 'to' flags to parse_date
When given a day, allows you to select which end of the day
2014-02-07 10:17:02 -07:00
William Minchin
24a5712c4d Fix linewrap
If a line was exactly the length of `linewrap`, the extra space was
causing the next line to be blank. But if the line is empty, we need the
space to maintain the `| ` sidebar.
2014-02-07 08:24:30 -07:00
William Minchin
cac0b722cd Don't replace all double spaces
want to maintain the ability to format with the use of just text.
2014-02-07 08:21:28 -07:00
Manuel Ebert
18d5348529 Download count 2014-02-05 12:21:27 -08:00
Manuel Ebert
3931e40cd1 Merge pull request #131 from maebert/limit-shortcut
Limit shortcut
2014-02-05 10:35:52 -08:00
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