Commit graph

860 commits

Author SHA1 Message Date
Jonathan Wren
a529b70614 Squashed commit of the following:
commit 75113187432939a51486422c3f70b3a9e2bcf0aa
Merge: 74d1854 47e10fb
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Thu Oct 24 17:02:10 2019 -0700

    Merge pull request #665 from notbalanced/issue_662

    Fixes Issue #662 - Day names not treated consistently for new entry

commit 74d1854a4bba468221b4eee254bdee2bb40f5d5a
Merge: 1bbf074 6a5726a
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Sat Oct 5 15:30:57 2019 -0700

    Merge pull request #418 from philipsd6/2.0-fancy_exporter

    Add exporter to output entries inside unicode box character boxes

commit 47e10fbee7
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 19:06:53 2019 -0400

    Fix issue #662 to properly handle day names as new entry dates and
    command line (-on, -from, -to).

commit 9588913100
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 08:27:27 2019 -0400

    Syncing with jrnl-org/master

commit 4c68eb193d
Merge: 81dfebb 1bbf074
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 07:52:02 2019 -0400

    Merge remote-tracking branch 'upstream/master' into 2.0-rc1-maebert

commit 81dfebb2c0
Author: Manuel Ebert <manuel@1450.me>
Date:   Mon Apr 29 20:34:18 2019 +0200

    export changes

commit 6a5726acd2
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Dec 22 20:56:36 2017 -0500

    Enable FancyExporter plugin

commit 3d1b226871
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Jan 29 11:17:41 2016 -0500

    Add exporter to output entries inside unicode box character boxes
2019-11-25 20:29:34 -08:00
Jonathan Wren
223277ad69
Merge pull request #752 from micahellison/693-dev-docs
[GH-693] Updating developer documentation (work in progress)
2019-11-25 20:25:08 -08:00
Micah Ellison
13bdd94dfb [GH-693] cleaning up "Developing" section and adding a note about behave 2019-11-25 20:22:44 -08:00
Jonathan Wren
0bd94c7872
Merge pull request #744 from alichtman/exit-after-no-text-entry
Exit jrnl if no text entered into editor
2019-11-18 22:06:04 -08:00
Micah Ellison
d947b19bcd [GH-693] work so far on updating developer documentation 2019-11-18 21:39:28 -08:00
Jonathan Wren
03e87237fc
Merge pull request #742 from MinchinWeb/dayone-tests
[Dayone] re-add tests
2019-11-18 21:20:00 -08:00
Jonathan Wren
5a874eeee7
Merge pull request #699 from pspeter/fix-keyring-without-backend
Fix crash when no keyring backend available
2019-11-18 20:12:16 -08:00
Jonathan Wren
b159ba4eab
Merge pull request #750 from jrnl-org/micahellison-new-labels
Adding "new" labels to new issues
2019-11-18 19:19:54 -08:00
micahellison
77f3a96648 Adding "new" labels to new issues 2019-11-18 19:18:26 -08:00
Jonathan Wren
d4d3298b42
Merge pull request #749 from micahellison/github-issues
Adding "🆕" label in new issue templates
2019-11-18 19:10:58 -08:00
Micah Ellison
712c0d1e20 Escaping colon label with quotes in new issue templates 2019-11-18 19:06:22 -08:00
Jonathan Wren
f1f06fd31f
Merge pull request #748 from micahellison/github-issues
Adding 🆕 label to github issue templates
2019-11-18 19:04:37 -08:00
Micah Ellison
4244ffb2ff Adding 🆕 label to github issue templates 2019-11-18 18:59:57 -08:00
Aaron Lichtman
7fbb5db5e7
Fix no stdin input test 2019-11-18 15:34:31 +01:00
Aaron Lichtman
9701401946
Fix test? 2019-11-18 14:51:41 +01:00
Aaron Lichtman
e4012426ca
Update features/core.feature
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-17 02:07:06 +01:00
Aaron Lichtman
b793ce5d6c
Fix test? 2019-11-17 01:57:19 +01:00
Aaron Lichtman
0aee900ffc
Fix test? 2019-11-17 01:54:49 +01:00
Aaron Lichtman
fce60a364f
Remove extra debug line 2019-11-17 01:49:58 +01:00
Aaron Lichtman
455261c55e
Add test for empty stdin input 2019-11-17 01:49:46 +01:00
Aaron Lichtman
91dcb812d7
Remove extra space 2019-11-17 01:49:07 +01:00
Aaron Lichtman
59a6aa3cfd
Remove extraneous code 2019-11-16 14:54:03 +01:00
Aaron Lichtman
7b84935470
Clean up debug statements 2019-11-16 14:53:07 +01:00
Aaron Lichtman
b1c7deb9b9
Clean up debug statements 2019-11-16 14:52:19 +01:00
Aaron Lichtman
5d75bc25c7
Fix test? 2019-11-16 14:49:07 +01:00
Aaron Lichtman
bca12b4b16
Fix test? 2019-11-16 14:46:34 +01:00
Aaron Lichtman
c23efa7f80
Fix test? 2019-11-16 14:42:39 +01:00
Aaron Lichtman
4cfff00d0a
Move sys.exit() down 2019-11-16 14:40:31 +01:00
Aaron Lichtman
8d22283b93
Update features/steps/core.py
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-16 14:35:50 +01:00
Aaron Lichtman
87571fa55f
Debug 2019-11-16 14:31:05 +01:00
Aaron Lichtman
7dcc91431e
Add debug statements 2019-11-16 14:16:36 +01:00
Aaron Lichtman
e63ae25433
Add return from mock function 2019-11-16 14:07:39 +01:00
Aaron Lichtman
68772d3afe
Update features/steps/core.py
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-16 13:51:55 +01:00
Aaron Lichtman
9b0ebb7d84
Add _mock_editor_function 2019-11-16 13:42:30 +01:00
Aaron Lichtman
ccb55392dd
Check message on stderr and patch subprocess.call 2019-11-16 13:18:14 +01:00
Aaron Lichtman
c0a1c171f1
Fix check_empty_output method 2019-11-16 13:06:04 +01:00
Aaron Lichtman
d378e2522d
Add comment explaining discrepancy between expected and asserted output 2019-11-15 09:38:20 +01:00
Aaron Lichtman
ac21a4facb
Merge branch 'master' into exit-after-no-text-entry 2019-11-15 09:34:50 +01:00
Aaron Lichtman
f0e5fe9653
Use native mocking 2019-11-15 09:33:47 +01:00
Aaron Lichtman
7a90f4076d
Add test for aborting jrnl entry from editor 2019-11-15 09:27:01 +01:00
Aaron Lichtman
2890e33cac
Exit jrnl if no text entered into editor
Fix #589
2019-11-14 12:00:23 +01:00
MinchinWeb
ad5d3a7856 [Dayone] Skip failing tests on Travis
Travis sets the timezone to UTC, which causes many tests to fail
2019-11-13 18:26:13 -07:00
MinchinWeb
ea594e5998 [Dayone] re-add tests
c.f. commit 7cbca9f60f
c.f. commit 2a401823b5
2019-11-13 18:10:57 -07:00
Jonathan Wren
4318da5b06
Merge pull request #710 from pspeter/support-py3-6
Support Python 3.6+
2019-11-12 13:47:56 -08:00
Peter Schmidbauer
b5c05cd846 Clarify currently supported Python versions
The Python 3.8 build currently fails on travis, this should be dealt with in a future PR along with updating the travis config and pyproject.toml
2019-11-12 18:50:51 +01:00
micahellison
4302cf2a81
[#696] supporting little-endian date format (e.g. DD/MM/YYYY)
Fix parsing Journals using a little-endian date format
2019-11-11 21:12:16 -08:00
Jonathan Wren
25c0feaab6
Merge branch 'master' into fix-custom-dates 2019-11-11 21:08:37 -08:00
Jonathan Wren
c098888612
Merge pull request #705 from pspeter/cleanup-py2-leftovers
remove py2 remnants and use mocks in tests
2019-11-11 20:53:10 -08:00
micahellison
f99009c56b
Merge pull request #736 from jrnl-org/v2.1.1
Merge v2.1.1
2019-11-11 19:10:42 -08:00
Peter Schmidbauer
f30e11d46f Prepare travis for upcoming poetry 1.0 release
The poetry version command will change in poetry 1.0 (see sdispater/poetry#1191). Without any argument, it won't bump the version anymore but instead just print the current version. This will break the current travis before_install. Let's pin poetry to ~0.12.17 for now and change it once poetry v1.0 releases.
2019-11-11 19:04:30 -08:00