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

768 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Wren
d3921d9e47 [GH-610] Fix for old crypto module (#621) 2019-07-16 15:04:18 -07:00
micahellison
1283157d56
Merge pull request #609 from wren/stalebot-607 
[GH-607] Add stalebot config
 2019-07-06 15:22:18 -07:00
Jonathan Wren
d8b8c20786
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
32e18d19c8 [GH-605] pointing to a more comprehensive GitHub issue re DayOne 2019-07-06 15:06:51 -07:00
Jonathan Wren
c747a817cf [GH-607] Add stalebot config 2019-07-06 14:59:18 -07:00
Micah Jerome Ellison
06ba06a62b [GH-605] mentioning lack of Day One support and relevant history in readme 2019-07-06 14:54:07 -07:00
Jonathan Wren
f709c07c63
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
micahellison
92942ed363
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
d3f091a3f0 [GH-602] Add a code of conduct file (rather than adding to contributing) 2019-07-06 13:35:43 -07:00
Micah Jerome Ellison
75b9b32296 [GH-600] updating Travis build badge and restoring pypi badges 2019-07-06 13:30:55 -07:00
micahellison
275504b035
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
9fcac40b09 [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
776eebdd60
Merge pull request #15 from jrnl-plus/v0.1-beta 
v0.1 beta
 2019-06-22 16:07:54 -07:00
Jonathan Wren
07bfe7f24f
Merge pull request #14 from wren/contributing-13 
[GH-13] Update contributing
 2019-06-22 16:02:40 -07:00
micahellison
99c3075965
Merge pull request #12 from micahellison/readme 
[GH-1] updating readme
 2019-06-22 15:59:05 -07:00
Jonathan Wren
77748ddd86 update contributing file 2019-06-22 15:54:38 -07:00
Micah Jerome Ellison
01a2956c04 [GH-1] fussing with author text 2019-06-22 15:13:51 -07:00
Micah Jerome Ellison
7bd770187c [GH-1] adding build badge back in 2019-06-22 15:05:26 -07:00
Micah Jerome Ellison
966e7f26cf [GH-1] updating readme to mention fork, instability 2019-06-22 14:57:20 -07:00
Jonathan Wren
18413b1887
Merge pull request #11 from wren/travis-badges-3 
#3 Update build badges
 2019-06-22 14:52:53 -07:00
Jonathan Wren
09bdf5ab70 [GH-3] update build badges 2019-06-22 14:47:40 -07:00
micahellison
0ba518cf1e
Merge pull request #8 from micahellison/travis-tests 
#5, #6 fixing failing tests
 2019-06-22 14:39:15 -07:00
Micah Jerome Ellison
d413a6b7e6 #6 allowing template interpreter to interpret common Python commands 2019-06-22 14:35:27 -07:00
Micah Jerome Ellison
2a401823b5 #5 Removing DayOne tests 2019-06-22 14:35:27 -07:00
Jonathan Wren
324022cde9
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
efd674aa34 update python version for ci 2019-06-22 14:28:54 -07:00
Jonathan Wren
60fbfa793b test commit directly to master 2019-06-22 13:06:03 -07:00
Manuel Ebert
81dfebb2c0 export changes 2019-04-29 20:34:18 +02:00
Jonathan Wren
bcfd2d4b43 Fix issue #584 YAMLLoadWarning (#585) 2019-04-14 09:47:31 -07:00
hoclun-rigsep
101aeaabb5 Use shlex to parse editor commandline as per 2.0-rc1 (#556) 2018-08-16 15:16:29 -07:00
Emma Humphries
6baf8e389e Add instructions for VS Code (#544) 2018-06-26 11:28:23 -07:00
Jenny Li
16f3637b8e minor typo fixes (#515) 2018-02-16 14:35:47 -08:00
Radomír Bosák
8615679beb 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
a95859a292 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
d65a9779ca 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
6d7bd18d52 Fix behave tests by adding asteval dependency (#469) 2017-03-09 11:56:44 -08:00
Manuel Ebert
2031902f1c Clean up 2016-08-19 23:23:14 +00:00
Manuel Ebert
4b3dc38e05 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
ce113af4e0 Fix JSON export 2016-08-19 21:44:12 +00:00
Manuel Ebert
dab853555e Indent character optional 2016-08-19 21:44:01 +00:00
Manuel Ebert
b3f5c092de Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
49a374e552 Upgrade to cryptography 1.4 2016-08-17 13:41:54 +00:00
Manuel Ebert
7776b3d24c Update Cryptography 
Fixes SSL issues described in
https://github.com/pyca/cryptography/issues/2750
 2016-08-16 11:00:08 +02:00
Manuel Ebert
8b64cc95d9 Exports 2016-07-17 13:35:35 -07:00
Philip Douglass
3580154f7d User defined indent character (#419) 
Make indent character configurable.
 2016-04-15 23:00:49 -07:00
Manuel Ebert
5921cd63f8 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
37f6e3c8b4 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
1ac5444051 Fully strip title and body after SENTENCE_SPLITTER search 2016-04-07 14:31:16 -04:00
Philip Douglass
a4783109b3 Clean up text wrapping once and for all 2016-04-07 14:29:28 -04:00
Manuel Ebert
4a871aff32 Merge pull request #399 from philipsd6/2.0-upgrade_unicode_and_tildes 
Support unicode and userdir expansion in config during 2.0 upgrade
 2016-02-10 10:41:06 -08:00