From b2fdc1ceaef51be966d6dad619d69eff57a22403 Mon Sep 17 00:00:00 2001 From: Ryan Plyler Date: Wed, 2 Jul 2014 21:34:31 +0800 Subject: [PATCH 1/2] Added PyCharm project files to .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 40fd38d0..3b171aba 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,9 @@ env/ env*/ docs/_themes/jrnl/static/less/3L.less + +# PyCharm Project files +.idea/ + +# export testing director +exp/ From b2aeb04b787f3789014d3c940fcef0c4190c29dc Mon Sep 17 00:00:00 2001 From: Ryan Plyler Date: Wed, 2 Jul 2014 21:43:38 +0800 Subject: [PATCH 2/2] 'jrnl -from' times now match greater/less than or equal to start and end times --- jrnl/Journal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jrnl/Journal.py b/jrnl/Journal.py index 35bdc395..0eb0ce5c 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -220,8 +220,8 @@ class Journal(object): entry for entry in self.entries if (not tags or tagged(entry.tags)) and (not starred or entry.starred) - and (not start_date or entry.date > start_date) - and (not end_date or entry.date < end_date) + and (not start_date or entry.date >= start_date) + and (not end_date or entry.date <= end_date) ] if short: if tags: