Commit graph

506 commits

Author SHA1 Message Date
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
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
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
karl
93b1edff9d Note for editing constraints on one line. FIX #199 2014-06-27 09:12:04 +09:00
Manuel Ebert
fa886151f6 Version bump 2014-06-26 15:30:39 +02:00
Manuel Ebert
0a59dc198d Merge pull request #204 from chrissexton/parallel_edits
Allow parallel edits
2014-06-26 15:19:38 +02:00
Manuel Ebert
cb1561481b Fixes error when exporting txt files
Fixes #202
2014-06-26 15:03:27 +02:00
Manuel Ebert
d8ccb928e0 Allow 'text' and 'markdown' aliases in export to dir
Fixes #201
2014-06-26 15:00:38 +02:00
Chris Sexton
7d782261e0 Allow parallel edits
* Wait to open the journal until after getting text
* Use mktemp so that editors like vim get separate files for editing
2014-06-26 08:29:42 -04:00
Manuel Ebert
3eb911f11b Dynamically load 3L library 2014-06-25 16:40:27 +02:00
Manuel Ebert
531ba63228 Merge pull request #188 from igniteflow/master
Add export options to help message
2014-06-25 12:39:59 +02:00
Phil Tysoe
65e45701d9 Add export options to help message 2014-06-25 10:24:39 +01:00
Manuel Ebert
a3676a66c7 Move 3L into vendors dir 2014-06-25 08:31:52 +02:00
Manuel Ebert
7a49ef3c79 Merge pull request #181 from jenmontes/patch-1
Typo fix
2014-06-25 08:29:14 +02:00
Manuel Ebert
36ac62928b Merge pull request #180 from mason-bially/master
Update recipies.rst with correct notepad++ options.
2014-06-25 08:28:25 +02:00
Jen Montes
c3d2eeed46 Typo fix
A quick spelling correction and I swapped the position of 2 words for clarity.
2014-06-24 22:03:30 -04:00
Mason Bially
e18c1a0154 Update recipies.rst with correct notepad++ options. 2014-06-24 17:43:33 -07:00
Manuel Ebert
97286722ab Merge pull request #178 from matze/use-env-editor
Try $VISUAL and $EDITOR for config['editor']
2014-06-25 00:49:02 +02:00
Manuel Ebert
8fb436e4ed Merge pull request #175 from jonjonsonjr/master
Fix terminal carousel on landing page of docs
2014-06-25 00:47:48 +02:00
Matthias Vogelgesang
4f73660231 Try $VISUAL and $EDITOR for config['editor']
On UNIX derivates they expand to the default or preferred editor and avoid
unnecessary first time edits of the config file.
2014-06-24 22:52:04 +02:00
Jon Johnson
30728df2d7 Fix terminal carousel on landing page of docs
This isn't perfect, but it is a step in the right direction. This fixes
the prev button not working at all and the next button having some
undesirable behavior.

This seems to work for the most part, but I noticed that if I leave this
open and go to a different tab in my browser, there's some strange
behavior when I come back to the landing page: there are multiple
outputs playing at once. This is similar to the current behavior, where
clicking the next button multiple times does the same thing.
2014-06-24 14:04:22 -04:00
Manuel Ebert
45f20a3550 Typo 2014-06-24 18:42:45 +02:00
Manuel Ebert
ed3772df11 Clarifications on writing docs 2014-06-24 18:41:49 +02:00
Manuel Ebert
3deb530f8d Merge pull request #167 from runiq/env-vars-in-config-paths
Allow use of environment variables in config paths
2014-06-24 18:17:54 +02:00
Patrice Peterson
6f5b3f52f3 Allow use of environment variables in config paths
This patch simply adds several calls to `os.expandvars` to functions
that parse paths in the config file.
2014-06-23 16:12:41 +02:00
Manuel Ebert
b1398dc9b2 Update README.md 2014-06-05 16:01:18 +02:00
Manuel Ebert
48a6e03183 Update README.md 2014-06-05 16:01:07 +02:00
Manuel Ebert
c882e4da28 Update README.md 2014-06-05 15:59:12 +02:00
Manuel Ebert
19ce72623c Update CONTRIBUTING.md 2014-05-22 14:19:24 -07:00
Manuel Ebert
eda50c144b Mark jrnl as 3.4 compatible 2014-05-22 14:18:15 -07:00