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
639 commits 10 branches 99 tags 14 MiB
Commit graph

639 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Phil Tysoe
9878b6e350 Add export options to help message 2014-06-25 10:24:39 +01:00
Manuel Ebert
6b2df88d29 Move 3L into vendors dir 2014-06-25 08:31:52 +02:00
Manuel Ebert
38ebf7920f Merge pull request #181 from jenmontes/patch-1 
Typo fix
 2014-06-25 08:29:14 +02:00
Manuel Ebert
466a9d1f84 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
2a0d9333fc 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
7e80071088 Update recipies.rst with correct notepad++ options. 2014-06-24 17:43:33 -07:00
Manuel Ebert
c95f8b5a1f 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
cfefb287db 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
562f700615 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
32203f95d8 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
57b272febf Typo 2014-06-24 18:42:45 +02:00
Manuel Ebert
9b2f05c9d7 Clarifications on writing docs 2014-06-24 18:41:49 +02:00
Manuel Ebert
e60ff1faf6 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
3639e00183 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
632d6990ec Update README.md 2014-06-05 16:01:18 +02:00
Manuel Ebert
db5bb6366c Update README.md 2014-06-05 16:01:07 +02:00
Manuel Ebert
98a9d53217 Update README.md 2014-06-05 15:59:12 +02:00
Manuel Ebert
97f19614ce Update CONTRIBUTING.md 2014-05-22 14:19:24 -07:00
Manuel Ebert
8a4401b670 Mark jrnl as 3.4 compatible 2014-05-22 14:18:15 -07:00
Manuel Ebert
e889e7d7a3 Merge pull request #164 from maebert/1.8 
Official support for python 3.4
 2014-05-22 13:49:31 -07:00
Manuel Ebert
7b2c47cbbe Catch proper exceptions in python3.4 2014-05-22 13:24:19 -07:00
Manuel Ebert
378baf17a1 Fixes xml header 2014-05-22 13:24:04 -07:00
Manuel Ebert
73ee4054d6 add six to requirements 2014-05-22 12:18:00 -07:00
Manuel Ebert
db99510720 Split DayOne into separate file 2014-05-22 12:17:54 -07:00
Manuel Ebert
a0333e60d5 Fix encoding in tests 2014-05-22 12:16:26 -07:00
Manuel Ebert
6953e340c4 Official support for python 3.4 2014-05-22 11:56:28 -07:00
Manuel Ebert
6a60cac4b5 Merge pull request #163 from maebert/fix-162 
Fix 162
 2014-05-19 14:47:44 -07:00
Manuel Ebert
c2692d88fe Changelog & version bump to 1.7.22 2014-05-19 14:43:56 -07:00
Manuel Ebert
b9685a55b0 Export to files using UTF-8 
Fixes #162
 2014-05-19 14:43:38 -07:00
Manuel Ebert
689f5b7461 Merge pull request #161 from notbalanced/master 
Re-fix Issue #56 by changing Regex for title.
 2014-04-29 09:42:47 -07:00
Craig Moyer
4442829306 Re-fix Issue #56 by changing Regex to discriminate between title and entry. 
Added BDD tests to cover this feature.
 2014-04-24 21:34:30 -04:00
Manuel Ebert
88a38efdc1 Merge pull request #158 from maebert/pkcs7 
PKCS#7 Padding
 2014-04-16 17:37:54 -04:00
Manuel Ebert
16e09a8095 byte2int for PY3 2014-04-16 17:14:57 -04:00
Manuel Ebert
91f677d825 Version bump & docs 2014-04-16 17:03:29 -04:00
Manuel Ebert
0b678ce69c Use PKCS#7 for encryption 
Closes #156
 2014-04-16 17:03:24 -04:00
Manuel Ebert
2b6768e427 Merge pull request #157 from maebert/1.7.20 
1.7.20
 2014-04-16 15:34:05 -04:00