Commit graph

779 commits

Author SHA1 Message Date
Jonathan Wren
a25d816fa1 [#681] Separate local dev from pipeline releases 2019-10-19 14:36:12 -07:00
Jonathan Wren
0f59c41712 [#681] Appease the poetry gods 2019-10-19 13:50:52 -07:00
Jonathan Wren
1840132b76 [#681] Update version handling in source and travis deployments 2019-10-19 13:41:59 -07:00
Jonathan Wren
27db5e520f ¯\_(ツ)_/¯ 2019-10-19 13:03:57 -07:00
Micah Jerome Ellison
367766c574 Merge pull request #670 from jrnl-org/v2.1
v2.1
2019-10-05 16:30:03 -07:00
Jonathan Wren
c97e782904 remove faulty conditional 2019-10-05 16:27:18 -07:00
Jonathan Wren
ff1a8bf6e9 update makefile to use poetry for more things 2019-10-05 16:07:34 -07:00
Jonathan Wren
69995836ac update version and author emails 2019-10-05 16:06:16 -07:00
Jonathan Wren
912653cd10 Merge branch 'pr/merge-v2.1'
Conflicts:
setup.py
2019-10-05 16:00:52 -07:00
Jonathan Wren
9881e872c5 update requirements to include pyyaml >= 5.1 2019-10-05 15:59:39 -07:00
Jonathan Wren
59df56d887 Merge pull request #660 from etnnth/yaml-version
Change pyYAML required version
2019-09-25 17:13:01 -07:00
etienne
57123d1a9f Change pyYAML required version
Full Loader only avalaible from v5.1:
2019-09-24 17:13:05 +02:00
Jonathan Wren
60b004b25f Merge pull request #655 from jrnl-org/manu--contributing
Fix references to Sphinx in CONTRIBUTING.md
2019-09-21 12:38:23 -07:00
Jonathan Wren
6b2596c2de Merge pull request #637 from jprof/add-not-flag
Add '-not' flag for excluding tags from filter
2019-09-21 12:37:34 -07:00
Jonathan Wren
50608b2758 Merge pull request #550 from silenc3r/master
Handle KeyboardInterrupt when installing journal
2019-09-21 12:36:49 -07:00
Micah Jerome Ellison
64837b8cc1 Merge pull request #657 from jrnl-org/v2.0.1
Prep v2.0.1
2019-09-21 12:13:44 -07:00
Manuel Ebert
d4d0b7c27c Fix references to Sphinx in contributing.md 2019-09-18 10:33:01 -07:00
Jonathan Wren
4542dadf27 Merge pull request #650 from micahellison/632-upgrade-tests
[GH-632] confirming that each journal can be parsed during upgrade
2019-08-24 15:51:00 -07:00
Jonathan Wren
c4a102f037 Merge pull request #649 from jrnl-org/manu--docs
Smaller doc fixes
2019-08-24 15:48:19 -07:00
Micah Jerome Ellison
aa0332c2a7 [GH-632] adding call to action to report issue when upgrade fails 2019-08-24 15:47:13 -07:00
Micah Jerome Ellison
4ff867ee5e [GH-632] removing unreachable return statement 2019-08-24 15:25:05 -07:00
Micah Jerome Ellison
261e22b6e0 [GH-632] removing unnecessary whitespace 2019-08-24 15:14:15 -07:00
Micah Jerome Ellison
b13a411e6f [GH-632] raising exception in upgrade.py on fail
Handling it in install.py to prevent config from being overwritten when upgrade fails
2019-08-24 15:01:23 -07:00
Micah Jerome Ellison
12c474ecd8 [GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not 2019-08-24 13:50:10 -07:00
Manuel Ebert
6127170c88 Found and removed another angsty teenager 2019-08-23 18:39:49 -07:00
Manuel Ebert
c09d71ad2f Smaller doc fixes, fixes #486 2019-08-23 18:38:05 -07:00
Jonathan Wren
8b4e84c914 Merge pull request #639 from MinchinWeb/export-md-headers
Switch to hashmark Markdown headers on export (Mk II)
2019-08-15 18:45:23 -07:00
Jonathan Wren
51f5ef54aa Merge pull request #612 from jrnl-org/manu--poetry
Use Poetry for dependency management and deployments
2019-08-15 17:50:15 -07:00
Manuel Ebert
06a106312f Add deployment through poetry to travis 2019-08-15 17:44:27 -07:00
Manuel Ebert
d51225da0f Add Poetry config 2019-08-15 17:42:45 -07:00
Micah Jerome Ellison
d29b9c82a9 Merge pull request #641 from gregorybodnar/create_encrypted_journal
Fix for #631 Create encrypted journal
2019-08-13 12:17:12 -07:00
Micah Jerome Ellison
4ad3eb14d6 Merge pull request #644 from wren/escape-dates-GH-631
#631 Escape data in square brackets
2019-08-13 12:16:08 -07:00
Micah Jerome Ellison
71ba5dd6db Merge pull request #646 from wren/stalebot-60
change pinned label to a super cool emoji 
2019-08-10 16:49:17 -07:00
Jonathan Wren
a1a8e02c13 change pinned label to a super cool emoji 2019-08-10 16:45:54 -07:00
Micah Jerome Ellison
096f68d87f Merge pull request #645 from wren/stalebot-60
move stablebot back up to 60 days now that backlog is a bit more cleared out
2019-08-10 16:35:21 -07:00
Jonathan Wren
a1b0f0c9ff move stablebot back up to 60 days now that backlog is a bit more cleared out 2019-08-10 16:21:38 -07:00
Jonathan Wren
ca25471ff1 #631 Escape data in square brackets 2019-08-10 13:37:03 -07:00
Jonathan Wren
a61d9238c4 fix a few linting errors 2019-08-10 12:17:36 -07:00
Justin Proffitt
a97e84fe5c Add tests for the excluding tags with -not 2019-08-07 20:58:35 -04:00
Dawid Zych
e9ebaf65c2 Handle KeyboardInterrupt when installing journal 2019-08-07 19:17:02 +02:00
Greg Bodnar
95c743fd05 Use util wrapper for getpass
This allows for tests to run without prompting for user input.
2019-08-04 13:21:40 +12:00
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
Jonathan Wren
6cc5e00874 Merge pull request #640 from wren/stalebot-update-3
reduce the number of days an issue can be open with no activity before marked stale
2019-08-03 12:10:24 -07:00
Jonathan Wren
f3ddf8410d reduce the number of days an issue can be open with no activity before marked stale
We will increase this again later, but we want to clean out the backlog of old issues
sooner, if possible. This will allow us to do that.
2019-08-03 12:08:31 -07:00
Greg Bodnar
d0d54f54ee Add failing test for configuring an encrypted journal 2019-08-03 16:48:10 +12:00
MinchinWeb
9299eb36e6 [YAML Exporter] apply fix just applied to Markdown Exporter 2019-08-01 21:21:55 -06:00
MinchinWeb
a9499eec62 [Markdown Export] deal with linebreaks in jrnl files 2019-08-01 21:00:53 -06:00
MinchinWeb
fafcd23e08 Switch to hashmark Markdown headers on export
Closes #487
2019-08-01 20:24:03 -06:00
Justin Proffitt
5aa881af67 Add '-not' flag for excluding tags from filter 2019-07-28 22:21:02 -04:00