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

583 commits

This branch
This branch
All branches
Author SHA1 Message Date
Radomír Bosák
0ec54f5656 Fix failing behave tests 
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
 2016-12-17 21:38:31 +01:00
Andrew Sauber
a6f6d7eec5 add fully functional decryption script to docs (#431) 2016-08-20 17:55:09 +00:00
doozr
4aa458d31a Do not crash if subdirs found inside Day One dir (#430) 2016-07-14 14:24:48 -07:00
Andrew Sauber
43658c1343 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
c25e6f37df Change README url to point to actual documentation (#423) 2016-05-06 11:02:53 -07:00
Manuel Ebert
bd8ea77e79 Don't build 2.6 2015-12-28 21:58:08 -08:00
Manuel Ebert
fa2f1aeb85 Merge pull request #370 from vitorgalvao/patch-1 
readme.md: homebrew instructions
 2015-12-28 21:54:54 -08:00
Vítor Galvão
051be7b5ac readme.md: homebrew instructions 2015-07-08 20:40:08 +01:00
Manuel Ebert
15ef9749ae 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
205269ae44 Merge pull request #310 from dedan/patch-2 
fix small typo
 2014-12-18 10:37:07 +07:00
Nik V
d0e49d2c72 Don't die if you specify a directory (DayOne journal) to install 2014-12-11 21:28:04 +08:00
Nik V
28c994fce1 Fix bug with dayone journals on linux 2014-12-11 21:21:18 +08:00
Manuel Ebert
17833c0df6 Merge pull request #321 from seinfield/master 
corrects issue #316
 2014-12-08 13:39:36 +07:00
seinfield
5d9cd1c324 corrected typo 2014-12-07 03:00:41 -05:00
seinfield
53c9663bb9 corrects issue #316 2014-12-07 02:55:49 -05:00
Manuel Ebert
511952e203 Icon update! 2014-11-29 18:36:42 +07:00
Stephan Gabler
6c390dafb4 fix small typo 2014-11-19 14:26:13 +01:00
Manuel Ebert
49b9e796c4 Merge pull request #309 from maebert/tmpfile-fix 
Fixes #308
 2014-11-17 15:46:45 +01:00
Manuel Ebert
e3329716c1 Fixes #308 2014-11-17 15:36:43 +01:00
Manuel Ebert
1046c18857 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
2511785dd4 Added exception info to the output when it cannot be loaded 2014-11-06 19:15:11 -05:00
Pablo Carranza
155b8e8f72 Added basic logging feature to understand how is configuration loaded 2014-11-06 15:36:03 -05:00
Manuel Ebert
fbecc6d062 Travis update 2014-11-06 12:38:57 +01:00
Manuel Ebert
1b98b3a3e5 github_release plug on setup.py 2014-11-06 12:35:31 +01:00
Manuel Ebert
3227c92e30 Merge pull request #304 from maebert/unicode-fixes 
Unicode fixes
 2014-11-06 11:33:36 +01:00
Manuel Ebert
33cb12d64f version bump 2014-11-06 11:30:15 +01:00
Manuel Ebert
bbf7f73a3f Fix for writing non-unicode entries on prompt 2014-11-06 11:30:11 +01:00
Manuel Ebert
0f754f97c1 Tests for writing non-unicode entries on prompt 2014-11-06 11:30:06 +01:00
Manuel Ebert
5b5c7cb6e8 Timezone parsing fix 2014-10-21 18:28:03 +02:00
Manuel Ebert
4256052e90 Open journal before writing 2014-10-21 18:28:03 +02:00
Manuel Ebert
733009e282 Safer temp file creation 2014-10-21 18:28:03 +02:00
Manuel Ebert
82d9c87617 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
8b8d899784 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
c64bf402fd 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
8fd0e2f62d Handle situation where a specified jounal is not found. 2014-10-06 16:45:25 -04:00
Manuel Ebert
c13029c668 Installation instructions for homebrew 2014-10-02 10:28:39 -07:00
Manuel Ebert
9310b60ed0 version bump 2014-09-30 10:17:07 -07:00
Manuel Ebert
0af00be1ba util fixes 2014-09-30 10:16:50 -07:00
Manuel Ebert
fe524d5b0c Merge pull request #283 from pcarranza/ontoday 
Fixed "-on today" option inclusive date parsing
 2014-09-25 12:35:17 -07:00
Pablo Carranza
3edb28790e Fixed -on today option parsing 2014-09-25 10:04:17 -04:00
Manuel Ebert
cc1d5b25ce 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
00015abf95 Added how to ignore history appending for zsh 2014-09-22 07:42:00 -04:00
Manuel Ebert
20e4ca2e14 Fix docs typo 2014-09-17 08:35:39 -07:00
Manuel Ebert
411b9eb844 Version bump 2014-09-02 13:27:16 -07:00
Manuel Ebert
391269335f Multi-Word tags for DayOne Journals 
Closes #274
 2014-09-02 13:27:11 -07:00
Manuel Ebert
182e51b92d Use unicode literals 
Fixes #273
 2014-09-02 13:26:50 -07:00
Manuel Ebert
050eea7560 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
6d783a80ac using a common tag regex for searching and highlighting 2014-08-30 10:02:59 -06:00
Manuel Ebert
a43ebd7b08 Version bump 2014-08-12 10:11:18 +02:00
Manuel Ebert
4390e1f10c Sort journal entries after editing 
Fixes #269
 2014-08-12 10:10:15 +02:00