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

583 commits

This branch
This branch
All branches
Author SHA1 Message Date
Radomír Bosák
4ba577db33 Fix failing behave tests (#447) 
The keyring package broke backward compatibility in version 8.0 by
moving some keyring backends to another package, keyrings.alt, as
documented in the changelog [1].

This change broke behave tests which were trying to use
keyring.backends.file.PlaintextKeyring - no longer existing in keyring
package.

This commit adds the keyrings.alt package as dependency so that the
PlaintextKeyring class can be used.

[1] https://pythonhosted.org/keyring/history.html#id22
 2017-01-04 10:24:03 -08:00
Andrew Sauber
b2ddd22e50 add fully functional decryption script to docs (#431) 2016-08-20 17:55:09 +00:00
doozr
cf6bc9c051 Do not crash if subdirs found inside Day One dir (#430) 2016-07-14 14:24:48 -07:00
Andrew Sauber
976a6faaa8 Minor Documentation Fixes (#425) 
* Update installation.rst

* minor fixes to encryption.rst

instruct user to set `HISTIGNORE` while maintaining their existing `HISTIGNORE`
minor whitespace change
 2016-05-17 10:35:56 -07:00
David Silva
54d36297a8 Change README url to point to actual documentation (#423) 2016-05-06 11:02:53 -07:00
Manuel Ebert
5dccceff78 Don't build 2.6 2015-12-28 21:58:08 -08:00
Manuel Ebert
7f8ebcbca6 Merge pull request #370 from vitorgalvao/patch-1 
readme.md: homebrew instructions
 2015-12-28 21:54:54 -08:00
Vítor Galvão
4a89f92f97 readme.md: homebrew instructions 2015-07-08 20:40:08 +01:00
Manuel Ebert
7c1d552a35 Merge pull request #325 from nikvdp/master 
Correct issue #259, also fix issue with specifying DayOne journals in install
 2015-01-11 08:50:24 -08:00
Manuel Ebert
f5f301c519 Merge pull request #310 from dedan/patch-2 
fix small typo
 2014-12-18 10:37:07 +07:00
Nik V
b99c82f9be Don't die if you specify a directory (DayOne journal) to install 2014-12-11 21:28:04 +08:00
Nik V
ef0227cf89 Fix bug with dayone journals on linux 2014-12-11 21:21:18 +08:00
Manuel Ebert
d0b476187f Merge pull request #321 from seinfield/master 
corrects issue #316
 2014-12-08 13:39:36 +07:00
seinfield
10235b77ce corrected typo 2014-12-07 03:00:41 -05:00
seinfield
3323db3e2a corrects issue #316 2014-12-07 02:55:49 -05:00
Manuel Ebert
270157010c Icon update! 2014-11-29 18:36:42 +07:00
Stephan Gabler
12d34667fd fix small typo 2014-11-19 14:26:13 +01:00
Manuel Ebert
79eb1bb757 Merge pull request #309 from maebert/tmpfile-fix 
Fixes #308
 2014-11-17 15:46:45 +01:00
Manuel Ebert
44c74d509c Fixes #308 2014-11-17 15:36:43 +01:00
Manuel Ebert
d216dcdbd2 Merge pull request #305 from pcarranza/debug-flag 
Added basic logging feature to understand how is configuration loaded
 2014-11-09 10:51:03 +01:00
Pablo Carranza
75eaf275b4 Added exception info to the output when it cannot be loaded 2014-11-06 19:15:11 -05:00
Pablo Carranza
a43cf16395 Added basic logging feature to understand how is configuration loaded 2014-11-06 15:36:03 -05:00
Manuel Ebert
73d9882b64 Travis update 2014-11-06 12:38:57 +01:00
Manuel Ebert
e77037b0f1 github_release plug on setup.py 2014-11-06 12:35:31 +01:00
Manuel Ebert
b45e52f743 Merge pull request #304 from maebert/unicode-fixes 
Unicode fixes
 2014-11-06 11:33:36 +01:00
Manuel Ebert
474bf0a71a version bump 2014-11-06 11:30:15 +01:00
Manuel Ebert
799ff762b2 Fix for writing non-unicode entries on prompt 2014-11-06 11:30:11 +01:00
Manuel Ebert
43f1166ecf Tests for writing non-unicode entries on prompt 2014-11-06 11:30:06 +01:00
Manuel Ebert
acf41a153a Timezone parsing fix 2014-10-21 18:28:03 +02:00
Manuel Ebert
19c57ecf70 Open journal before writing 2014-10-21 18:28:03 +02:00
Manuel Ebert
94b53b9247 Safer temp file creation 2014-10-21 18:28:03 +02:00
Manuel Ebert
9603f7d3ad Merge pull request #289 from willbarrett/bug/journal-not-found 
Handle situation where a specified jounal is not found.
 2014-10-20 11:47:55 -07:00
Manuel Ebert
cde55ad540 Merge pull request #294 from jfunction/master 
Fixed a bug. --edit now shows [1 entry modified] not [1 entries modified]
 2014-10-16 15:22:54 -07:00
jfunction
1013d77173 Fixed a bug whereby editing a single entry resulted in the plural form being used. Now editing one entry results in "[1 entry modified]" 2014-10-15 14:23:03 +02:00
Will Barrett
76881f66e9 Handle situation where a specified jounal is not found. 2014-10-06 16:45:25 -04:00
Manuel Ebert
e6cfeabc17 Installation instructions for homebrew 2014-10-02 10:28:39 -07:00
Manuel Ebert
17b439eba4 version bump 2014-09-30 10:17:07 -07:00
Manuel Ebert
c8e5d1ff34 util fixes 2014-09-30 10:16:50 -07:00
Manuel Ebert
bd6edffc81 Merge pull request #283 from pcarranza/ontoday 
Fixed "-on today" option inclusive date parsing
 2014-09-25 12:35:17 -07:00
Pablo Carranza
e9f691e399 Fixed -on today option parsing 2014-09-25 10:04:17 -04:00
Manuel Ebert
05e63dc76a Merge pull request #278 from pcarranza/master 
Added how to ignore history appending for zsh
 2014-09-22 12:16:16 -07:00
Pablo Carranza
c81f0e0c1d Added how to ignore history appending for zsh 2014-09-22 07:42:00 -04:00
Manuel Ebert
afcccb78c1 Fix docs typo 2014-09-17 08:35:39 -07:00
Manuel Ebert
fc1935d64e Version bump 2014-09-02 13:27:16 -07:00
Manuel Ebert
6d12ccc579 Multi-Word tags for DayOne Journals 
Closes #274
 2014-09-02 13:27:11 -07:00
Manuel Ebert
4301927b72 Use unicode literals 
Fixes #273
 2014-09-02 13:26:50 -07:00
Manuel Ebert
53958cf328 Merge pull request #261 from kneufeld/master 
using a common tag regex for searching and highlighting
 2014-09-02 13:07:33 -07:00
Kurt Neufeld
2f1894c765 using a common tag regex for searching and highlighting 2014-08-30 10:02:59 -06:00
Manuel Ebert
5bfb82cf90 Version bump 2014-08-12 10:11:18 +02:00
Manuel Ebert
2e75713a91 Sort journal entries after editing 
Fixes #269
 2014-08-12 10:10:15 +02:00