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

719 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg Bodnar
5d3d988fa0 Modify test to test for returned strings 
The entered string for the password is not being used by the test and I
don't understand why.
 2019-08-04 08:44:17 +12:00
Greg Bodnar
278b736d25 Overload open for EncryptedJournal 
This avoids the execution path that calls EncryptedJournal._create()
without a password parameter. It results in duplication of code that
requests and stores a password, which should be factored out in a
subsequent change.
 2019-08-04 08:40:15 +12:00
Greg Bodnar
d0d54f54ee Add failing test for configuring an encrypted journal 2019-08-03 16:48:10 +12:00
Micah Jerome Ellison
714ed2cc9f Merge pull request #609 from wren/stalebot-607 
[GH-607] Add stalebot config
 2019-07-06 15:22:18 -07:00
Jonathan Wren
0a474c8ee2 Merge pull request #608 from micahellison/605-dayone-readme 
[GH-605] mentioning lack of Day One support and relevant history in readme
 2019-07-06 15:09:20 -07:00
Micah Jerome Ellison
a204e5721a [GH-605] pointing to a more comprehensive GitHub issue re DayOne 2019-07-06 15:06:51 -07:00
Jonathan Wren
5d8db19a1f [GH-607] Add stalebot config 2019-07-06 14:59:18 -07:00
Micah Jerome Ellison
ef80ff3461 [GH-605] mentioning lack of Day One support and relevant history in readme 2019-07-06 14:54:07 -07:00
Jonathan Wren
cd34cdba69 Merge pull request #603 from micahellison/600-travis 
[GH-600] updating Travis build badge and restoring pypi badges
 2019-07-06 14:02:57 -07:00
Micah Jerome Ellison
759174c56b Merge pull request #604 from wren/update-contributing-602 
[GH-602] Add a code of conduct file (rather than adding to contributing)
 2019-07-06 13:40:10 -07:00
Jonathan Wren
b1f104ac7f [GH-602] Add a code of conduct file (rather than adding to contributing) 2019-07-06 13:35:43 -07:00
Micah Jerome Ellison
21cefcc32c [GH-600] updating Travis build badge and restoring pypi badges 2019-07-06 13:30:55 -07:00
Micah Jerome Ellison
c1bd9359c2 Merge pull request #601 from micahellison/598-jrnl-mentions 
[GH-598] Changing references from jrnl-plus back to jrnl
 2019-07-06 12:58:39 -07:00
Micah Jerome Ellison
cff42cfcc6 [GH-598] Changing references from jrnl-plus back to jrnl and ensuring the URLs are valid (except build badge) 2019-07-06 12:12:56 -07:00
Jonathan Wren
1796334e84 Merge pull request #15 from jrnl-plus/v0.1-beta 
v0.1 beta
 2019-06-22 16:07:54 -07:00
Jonathan Wren
f40566c881 Merge pull request #14 from wren/contributing-13 
[GH-13] Update contributing
 2019-06-22 16:02:40 -07:00
Micah Jerome Ellison
2334ebee55 Merge pull request #12 from micahellison/readme 
[GH-1] updating readme
 2019-06-22 15:59:05 -07:00
Jonathan Wren
969187be53 update contributing file 2019-06-22 15:54:38 -07:00
Micah Jerome Ellison
74eadf8e82 [GH-1] fussing with author text 2019-06-22 15:13:51 -07:00
Micah Jerome Ellison
712943a680 [GH-1] adding build badge back in 2019-06-22 15:05:26 -07:00
Micah Jerome Ellison
f6ef3a6307 [GH-1] updating readme to mention fork, instability 2019-06-22 14:57:20 -07:00
Jonathan Wren
19e613517f Merge pull request #11 from wren/travis-badges-3 
#3 Update build badges
 2019-06-22 14:52:53 -07:00
Jonathan Wren
6f5a0a3b48 [GH-3] update build badges 2019-06-22 14:47:40 -07:00
Micah Jerome Ellison
ce2f655991 Merge pull request #8 from micahellison/travis-tests 
#5, #6 fixing failing tests
 2019-06-22 14:39:15 -07:00
Micah Jerome Ellison
6fef395f6c #6 allowing template interpreter to interpret common Python commands 2019-06-22 14:35:27 -07:00
Micah Jerome Ellison
6f6ec1953c #5 Removing DayOne tests 2019-06-22 14:35:27 -07:00
Jonathan Wren
7dffc54fbc Merge pull request #10 from wren/tests-ci-9 
#9 Update Python version for CI
 2019-06-22 14:32:04 -07:00
Jonathan Wren
5ac5e0562a update python version for ci 2019-06-22 14:28:54 -07:00
Jonathan Wren
486cd55262 test commit directly to master 2019-06-22 13:06:03 -07:00
Jonathan Wren
e9fc13cd2a Fix issue #584 YAMLLoadWarning (#585) 2019-04-14 09:47:31 -07:00
hoclun-rigsep
6826f07b6e Use shlex to parse editor commandline as per 2.0-rc1 (#556) 2018-08-16 15:16:29 -07:00
Emma Humphries
240fb883cc Add instructions for VS Code (#544) 2018-06-26 11:28:23 -07:00
Jenny Li
9ec6569628 minor typo fixes (#515) 2018-02-16 14:35:47 -08:00
Radomír Bosák
d6db0c1549 Remove --use-mirrors switch from travis setup (#477) 
The --use-mirrors pip switch does not work since pip 7.0.0. This caused
travis builds to fail.

This commit removes the --use-mirrors switch.
 2017-03-10 09:47:43 -08:00
Radomír Bosák
8fe8e00e1b Catch keyboard interrupt when opening journal (#476) 
If the journal is encrypted, jrnl asks for a password using the
getpass.getpass function. If user presses the keyboard interrupt (e.g.
ctrl+c) during the password prompt, jrnl crashes and prints a stack
trace. This however is not very user friendly.

This commit adds a check for KeyboardInterrupt Exception and prints a
message whenever this exception occurs and exits. Stack is no longer
printed.

Fixes #450
 2017-03-10 08:54:02 -08:00
Radomír Bosák
ca2d9f072f Fix python2 error in template_explorer.py (#471) 
If template_explorer.py was imported in python2, it would fail because
it uses unicode_literals which would ultimately cause passing an unicode
string as the first argument to the 'type' built-in function.

This commit fixes this by converting the unicode to string before it is
passed to the 'type' function.

Fixes #456
 2017-03-09 11:59:03 -08:00
Radomír Bosák
095369f705 Fix behave tests by adding asteval dependency (#469) 2017-03-09 11:56:44 -08:00
Manuel Ebert
549a3e9d8f Clean up 2016-08-19 23:23:14 +00:00
Manuel Ebert
60a955de20 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
f4dfecb62f Fix JSON export 2016-08-19 21:44:12 +00:00
Manuel Ebert
6a53da5efd Indent character optional 2016-08-19 21:44:01 +00:00
Manuel Ebert
bdc9dc598d Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
69fc08f6f3 Upgrade to cryptography 1.4 2016-08-17 13:41:54 +00:00
Manuel Ebert
e7b8158d22 Update Cryptography 
Fixes SSL issues described in
https://github.com/pyca/cryptography/issues/2750
 2016-08-16 11:00:08 +02:00
Manuel Ebert
85934c1980 Exports 2016-07-17 13:35:35 -07:00
Philip Douglass
ba05411a80 User defined indent character (#419) 
Make indent character configurable.
 2016-04-15 23:00:49 -07:00
Manuel Ebert
dbf912c661 Merge pull request #417 from philipsd6/2.0-strip_entry_body 
Fully strip title and body after SENTENCE_SPLITTER search
 2016-04-07 13:15:12 -07:00
Manuel Ebert
4e153c6e09 Merge pull request #420 from philipsd6/2.0-better_textwrap 
Clean up text wrapping once and for all --- Please!
 2016-04-07 13:13:54 -07:00
Philip Douglass
b2147d53c5 Fully strip title and body after SENTENCE_SPLITTER search 2016-04-07 14:31:16 -04:00
Philip Douglass
eec009fd18 Clean up text wrapping once and for all 2016-04-07 14:29:28 -04:00