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

699 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manuel Ebert
375b6e1d0b Makefile update 2014-07-28 18:44:00 -06:00
Manuel Ebert
2461524299 Version bump 2014-07-28 18:43:57 -06:00
Manuel Ebert
36cbc02276 Tests for filtering by tags 2014-07-28 18:43:54 -06:00
Manuel Ebert
ef6f5e85f5 Adds the tag symbol to day one entries on load 2014-07-28 18:43:51 -06:00
Josh Tan
1faf496595 Simplified syntax for joining journal names with new lines. 2014-07-28 18:43:48 -06:00
Josh Tan
b121c53186 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-07-28 18:43:44 -06:00
Manuel Ebert
891f20ae9b Flexible argparse for 2.6 2014-07-28 18:43:41 -06:00
William Minchin
0f0b31e67f 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-07-28 18:43:38 -06:00
William Minchin
c75efd8326 Don't replace all double spaces 
want to maintain the ability to format with the use of just text.
 2014-07-28 18:43:35 -06:00
Manuel Ebert
34e35fd8cb Download count 2014-07-28 18:43:32 -06:00
Manuel Ebert
c6c7ce35aa Changelog and docs 2014-07-28 18:43:29 -06:00
Manuel Ebert
4440bf5ca1 Allows -3 as a shortcut for -n 3 2014-07-28 18:43:25 -06:00
Manuel Ebert
2e6dfcbeb4 Clean up 2014-07-28 18:43:22 -06:00
William Minchin
87ec18fa78 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-07-28 18:43:19 -06:00
William Minchin
d957fd70ee Fix typos in test files 2014-07-28 18:43:16 -06:00
William Minchin
253978f747 require tzlocal version 1.1 or better 
jrnl needs the OSX fixes in version 1.1
 2014-07-28 18:43:13 -06:00
William Minchin
0790204a85 [Travis-CI] manually install PyCrypto 2014-07-28 18:43:09 -06:00
William Minchin
fb23c41bba Use Travis-CI without requirements.txt 2014-07-28 18:43:06 -06:00
William Minchin
eb273a446b Just use setup.py 
(don't keep a second copy in `requirements.txt`)
 2014-07-28 18:43:03 -06:00
William Minchin
c756770a67 allow newer versions of tzlocal 2014-07-28 18:43:00 -06:00
Manuel Ebert
bf49f31d22 Manifest update 2014-07-27 12:43:26 +09:00
Manuel Ebert
2150b5b3e7 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
4d6cdc835e 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
b8a3b6d9ad There should be a whitespace character in front of a tag. Fixes issue #237. 2014-07-22 22:14:26 -04:00
Manuel Ebert
112f626d09 Merge pull request #248 from maebert/1-9-1 
Fix parsing of  future timestmpas
 2014-07-21 17:50:06 +09:00
Manuel Ebert
8d1f5fe862 Version bump 2014-07-21 17:33:44 +09:00
Manuel Ebert
4b4d29bf08 Regression test for future timestamps 2014-07-21 17:33:39 +09:00
Manuel Ebert
929896e53e Don't correct future timestamps if year is present in input 2014-07-21 17:33:30 +09:00
Manuel Ebert
340c510a8b Docs update 
Closes #176
 2014-07-21 14:58:01 +09:00
Manuel Ebert
30c30812a9 Merge pull request #247 from maebert/1-9-0 
Greatly improved date parsing
 2014-07-21 14:52:10 +09:00
Manuel Ebert
6837c46351 Conditional dateutil for python 3 2014-07-21 14:22:16 +09:00
Manuel Ebert
7f9cd675fe Fix bug when omitting day in parsing 2014-07-21 14:22:07 +09:00
Manuel Ebert
22b5119cb0 Version bump 2014-07-21 13:30:39 +09:00
Manuel Ebert
41d093cc19 Tests for date parsing and -on 2014-07-21 13:30:36 +09:00
Manuel Ebert
2d46b0250b Introduces -on option 
Fixes #246
 2014-07-21 13:30:25 +09:00
Manuel Ebert
49f67df064 Improves dateutil parsing 
Closes #133
Fixes #183, #185, #228
 2014-07-21 13:30:10 +09:00
Manuel Ebert
f604862488 Merge pull request #239 from StevenMaude/patch-1 
Minor typo in installation.rst
 2014-07-17 10:42:21 +09:00
Steven Maude
811167704b Minor typo in installation.rst 
Fix "PyCyrypto" to "PyCrypto".
 2014-07-12 00:06:11 +01:00
Manuel Ebert
ad2d278ae5 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
fd529a485c Version bump to 1.8.7 2014-07-03 09:13:07 +02:00
Ryan Plyler
85826ca77b '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
f3871aab02 Added PyCharm project files to .gitignore 2014-07-03 09:11:29 +02:00
Ryan Plyler
6f4ab856d3 '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
0618082aae Merge branch 'master' of https://github.com/maebert/jrnl into fromfix 2014-07-02 21:36:49 +08:00
Manuel Ebert
53e947ac18 Version bump 2014-07-02 15:36:04 +02:00
Manuel Ebert
c05fdfdad7 Tests for tagging 2014-07-02 15:35:05 +02:00
Ryan Plyler
4df3571b47 Added PyCharm project files to .gitignore 2014-07-02 21:34:31 +08:00
Manuel Ebert
919b9ae3e4 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
8be672a1d9 Merge pull request #226 from grplyler/master 
Fixed typo in CONTRIBUTING.md
 2014-06-30 21:11:47 +02:00
Manuel Ebert
15b7d2603c Notes on encryption 2014-06-30 18:00:38 +02:00