timetoplatypus
7fefec0ca9
Merge branch 'master' into HEAD
2017-09-09 10:23:17 -04:00
timetoplatypus
9876decfec
Updates README.md
...
Adds instructions for installing from source using `setup.py`
2017-08-30 13:01:41 -04:00
timetoplatypus
e0c74011ca
Adds feature to export a journal to a static HTML page
...
(with inline CSS)
2017-08-29 21:28:59 -04:00
timetoplatypus
1080298930
Adds import feature for JSON formatted journals.
2017-08-26 20:15:04 -04: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
Sylvain
9ffca1a7a6
Add most recent Python versions in Travis CI ( #474 )
...
Add more recent Python versions including development branches and nightly build.
2017-03-09 12:47:52 -08:00
Manuel Ebert
247310fea2
Docs CSS update
2017-03-09 12:42:08 -08:00
Manuel Ebert
5787bd0bd9
Explicit code blocks in docs
2017-03-09 12:40:38 -08:00
Manuel Ebert
de91e1ea0d
Updated docs from master
2017-03-09 12:09:05 -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
Paul Liu
9fe8728d21
Update iA Writer bundle id ( #464 )
2017-02-12 21:03:42 -08:00
Manuel Ebert
4659b9381b
Update CONTRIBUTING.md
2017-01-04 12:02:53 -08:00
Radomír Bosák
3f55633451
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
a6f6d7eec5
add fully functional decryption script to docs ( #431 )
2016-08-20 17:55:09 +00: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
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
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
Manuel Ebert
e9d856b039
Update dependencies and lock versions on keyring and cryptography. Fixes #407
2016-02-10 10:24:52 -08:00
Philip Douglass
91cf1c911f
Open config_path as utf-8
2016-01-24 21:16:50 -05:00
Philip Douglass
1aef13d757
Expand vars and user tilde for upgrade backup
2016-01-24 21:09:17 -05:00
Manuel Ebert
659502adf5
Docs on Alfred integration
...
Fixes #364
2016-01-11 12:17:59 -08:00
Manuel Ebert
155be26840
Doc update on HISTIGNORE
...
Fixes #394
2016-01-11 12:11:56 -08:00
Manuel Ebert
06e3f0c101
Byte encoding for getpass
...
Fixes #392 and #393
2016-01-11 12:08:05 -08:00
Manuel Ebert
7a0e056130
Unicode literals in util
2015-12-28 22:07:26 -08:00
Manuel Ebert
bd8ea77e79
Don't build 2.6
2015-12-28 21:58:08 -08:00
Manuel Ebert
38682b922f
Remove references to jrnl[encrypted]
2015-12-28 21:56: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
Manuel Ebert
5805cef008
Drop whitespace in print
...
Fixes #222 and #376
2015-12-28 21:53:23 -08:00
flight16
06a9ed2026
Merged PR
2015-12-28 21:36:17 -08:00
Manuel Ebert
79fa9c5434
Seperation of title and entry is now purely virtual.
...
Fixes #360
2015-12-28 21:24:39 -08:00
Manuel Ebert
76bc803776
--export text doesn't indent
...
Fixes #373
2015-12-28 13:06:26 -08:00
Manuel Ebert
168f63c657
Fix XML export
2015-12-28 13:01:33 -08:00
Vítor Galvão
051be7b5ac
readme.md: homebrew instructions
2015-07-08 20:40:08 +01:00
Manuel Ebert
d0f86d398f
Update tests for templates
2015-07-01 22:23:13 -07:00
