fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-12 09:28:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
575 commits 10 branches 99 tags 14 MiB
Commit graph

575 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
grplyler
9871221fb2 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
2332fca6fe New make options 2014-06-30 11:14:25 +02:00
B Krishna Chaitanya
a2be5d25fc Unescaped -, + and * in regex 2014-06-30 14:38:00 +05:30
Manuel Ebert
3a65ce227d Version bump & new recipes 2014-06-30 10:26:54 +02:00
Manuel Ebert
07f2e2be34 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
b423bfc963 Include the year in exported file name 2014-06-30 07:01:33 +02:00
Manuel Ebert
3f5b5ff3c3 Restrict --export argument 
Fixes #187
 2014-06-28 17:55:10 +02:00
B Krishna Chaitanya
8b45458f90 Include [-+/*#] in tag characters 2014-06-27 21:12:42 +05:30
Manuel Ebert
8314c85463 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
f5a3d7328c Installs readline on non-windows if not available 
Fixes #208
 2014-06-27 15:56:12 +02:00
Manuel Ebert
fa243065d9 Merge branch 'pr/213' 2014-06-27 14:11:54 +02:00
Manuel Ebert
b4944c808d Link to advanced usage 2014-06-27 14:11:42 +02:00
Manuel Ebert
a593ed80b9 Merge branch 'pr/198' 2014-06-27 14:01:53 +02:00
Jonathon Scanes
3f4b873ec9 Printed message aborted on ctrl+c. 2014-06-27 14:01:16 +02:00
Jonathon Scanes
948d031777 Prevent printing stack trace in compose mode on ctrl+c. 2014-06-27 14:00:20 +02:00
B Krishna Chaitanya
f9af744a29 Changed regex to accept symbols 2014-06-27 11:58:59 +05:30
karl
6f8755ab55 Note for editing constraints on one line. FIX #199 2014-06-27 09:12:04 +09:00
Manuel Ebert
8eeba1481d Version bump 2014-06-26 15:30:39 +02:00
Manuel Ebert
fe41e41a6f Merge pull request #204 from chrissexton/parallel_edits 
Allow parallel edits
 2014-06-26 15:19:38 +02:00
Manuel Ebert
828ea4d427 Fixes error when exporting txt files 
Fixes #202
 2014-06-26 15:03:27 +02:00
Manuel Ebert
872cab6cb4 Allow 'text' and 'markdown' aliases in export to dir 
Fixes #201
 2014-06-26 15:00:38 +02:00
Chris Sexton
9276a92a0b 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
b8b928f277 Dynamically load 3L library 2014-06-25 16:40:27 +02:00
Manuel Ebert
cabaa6a832 Merge pull request #188 from igniteflow/master 
Add export options to help message
 2014-06-25 12:39:59 +02:00