Commit graph

733 commits

Author SHA1 Message Date
Manuel Ebert
7617f9e7f8 Merge pull request #267 from maebert/issue-265
Tags at the beginning of entries
2014-08-07 13:31:25 +02:00
Manuel Ebert
9c4b97ef5c typo 2014-08-07 13:27:48 +02:00
Manuel Ebert
2024e956bd Version bump 2014-08-07 13:26:10 +02:00
Manuel Ebert
db3de3d1cc Tags at the beginning of lines 2014-08-07 13:25:50 +02:00
Manuel Ebert
6dafc3d939 Manifest update 2014-07-27 12:43:26 +09:00
Manuel Ebert
010e1f868d Merge pull request #252 from mjhoffman65/issue237
There should be a whitespace character in front of a tag.  Fixes issue #...
2014-07-27 12:32:30 +09:00
U-NA\cle1413
e0fb621110 Add assertion to scenario that verifies a tag on a new line is recoginized as a tag. 2014-07-23 11:19:47 -04:00
Matt Hoffman
d5142a0a0a There should be a whitespace character in front of a tag. Fixes issue #237. 2014-07-22 22:14:26 -04:00
Manuel Ebert
f8a337f66e Merge pull request #248 from maebert/1-9-1
Fix parsing of  future timestmpas
2014-07-21 17:50:06 +09:00
Manuel Ebert
28dcb3ab90 Version bump 2014-07-21 17:33:44 +09:00
Manuel Ebert
286366ae85 Regression test for future timestamps 2014-07-21 17:33:39 +09:00
Manuel Ebert
4dbdc7032d Don't correct future timestamps if year is present in input 2014-07-21 17:33:30 +09:00
Manuel Ebert
da17dc9d8a Docs update
Closes #176
2014-07-21 14:58:01 +09:00
Manuel Ebert
f4dcc7126e Merge pull request #247 from maebert/1-9-0
Greatly improved date parsing
2014-07-21 14:52:10 +09:00
Manuel Ebert
5799be7f1c Conditional dateutil for python 3 2014-07-21 14:22:16 +09:00
Manuel Ebert
316374922b Fix bug when omitting day in parsing 2014-07-21 14:22:07 +09:00
Manuel Ebert
7f7f00e91b Version bump 2014-07-21 13:30:39 +09:00
Manuel Ebert
1822f50c70 Tests for date parsing and -on 2014-07-21 13:30:36 +09:00
Manuel Ebert
6a16edb67b Introduces -on option
Fixes #246
2014-07-21 13:30:25 +09:00
Manuel Ebert
6f1dd6077e Improves dateutil parsing
Closes #133
Fixes #183, #185, #228
2014-07-21 13:30:10 +09:00
Manuel Ebert
c814ba9bc2 Merge pull request #239 from StevenMaude/patch-1
Minor typo in installation.rst
2014-07-17 10:42:21 +09:00
Steven Maude
2dcb3f215d Minor typo in installation.rst
Fix "PyCyrypto" to "PyCrypto".
2014-07-12 00:06:11 +01:00
Manuel Ebert
5a2460a12d Merge pull request #232 from grplyler/fromfix
jrnl -from and -to times do not include the time themselves
2014-07-03 09:13:51 +02:00
Manuel Ebert
8ee51a6db0 Version bump to 1.8.7 2014-07-03 09:13:07 +02:00
Ryan Plyler
1c5ff1d5b8 'jrnl -from' times now match greater/less than or equal to start and end times 2014-07-03 09:11:29 +02:00
Ryan Plyler
08da5e01d8 Added PyCharm project files to .gitignore 2014-07-03 09:11:29 +02:00
Ryan Plyler
b2aeb04b78 'jrnl -from' times now match greater/less than or equal to start and end times 2014-07-02 21:53:28 +08:00
Ryan Plyler
a9cef019ad Merge branch 'master' of https://github.com/maebert/jrnl into fromfix 2014-07-02 21:36:49 +08:00
Manuel Ebert
d8e0bab3ab Version bump 2014-07-02 15:36:04 +02:00
Manuel Ebert
88d4c52568 Tests for tagging 2014-07-02 15:35:05 +02:00
Ryan Plyler
b2fdc1ceae Added PyCharm project files to .gitignore 2014-07-02 21:34:31 +08:00
Manuel Ebert
e20ae39bf3 Merge pull request #217 from chaitan94/tag-regex
Changed Tag regex to accept special characters
2014-07-02 15:29:02 +02:00
Manuel Ebert
c159610723 Merge pull request #226 from grplyler/master
Fixed typo in CONTRIBUTING.md
2014-06-30 21:11:47 +02:00
Manuel Ebert
e0a603bcb8 Notes on encryption 2014-06-30 18:00:38 +02:00
grplyler
5dae85370f Fixed typo in CONTRIBUTING.md
Changed "sooner or later get implement it" to
"sooner or later get implemented."
2014-06-30 18:39:06 +08:00
Manuel Ebert
5b4e89f081 New make options 2014-06-30 11:14:25 +02:00
B Krishna Chaitanya
add0aea46d Unescaped -, + and * in regex 2014-06-30 14:38:00 +05:30
Manuel Ebert
be1a90db3d Version bump & new recipes 2014-06-30 10:26:54 +02:00
Manuel Ebert
9c592cfd36 Merge pull request #225 from jdevera/patch-1
Include the year in exported file name
2014-06-30 10:06:02 +02:00
Jacobo de Vera
18994f1aa1 Include the year in exported file name 2014-06-30 07:01:33 +02:00
Manuel Ebert
fadbdc27b9 Restrict --export argument
Fixes #187
2014-06-28 17:55:10 +02:00
B Krishna Chaitanya
ef0e192d79 Include [-+/*#] in tag characters 2014-06-27 21:12:42 +05:30
Manuel Ebert
69d5c5d844 Merge pull request #218 from maebert/readline
Installs readline on non-windows if not available
2014-06-27 16:08:25 +02:00
Manuel Ebert
f347b0deca Installs readline on non-windows if not available
Fixes #208
2014-06-27 15:56:12 +02:00
Manuel Ebert
f1637613b5 Merge branch 'pr/213' 2014-06-27 14:11:54 +02:00
Manuel Ebert
66ec554637 Link to advanced usage 2014-06-27 14:11:42 +02:00
Manuel Ebert
04b5a671b8 Merge branch 'pr/198' 2014-06-27 14:01:53 +02:00
Jonathon Scanes
065f98dda8 Printed message aborted on ctrl+c. 2014-06-27 14:01:16 +02:00
Jonathon Scanes
b0fe7cd330 Prevent printing stack trace in compose mode on ctrl+c. 2014-06-27 14:00:20 +02:00
B Krishna Chaitanya
af222fd526 Changed regex to accept symbols 2014-06-27 11:58:59 +05:30