Jonathan Wren
|
44bc75fb65
|
Merge branch 'master' into develop
|
2019-11-29 11:46:01 -08:00 |
|
Jonathan Wren
|
abb81acedb
|
Merge pull request #706 from pspeter/password-confirmation
🛠 Add password confirmation when encrypting journals
|
2019-11-29 06:42:38 -08:00 |
|
Jonathan Wren
|
b0b9c48aae
|
Merge pull request #759 from MinchinWeb/more-travis
🛠 Add CI testing for Windows, Mac, and Python 3.8
|
2019-11-29 06:30:05 -08:00 |
|
MinchinWeb
|
ae505dcbbd
|
[Travis] Windows tests time out
|
2019-11-28 09:14:50 -07:00 |
|
MinchinWeb
|
34f7d9830f
|
[Travis] Windows: try Python 3.7 for cryptography wheels?
|
2019-11-28 08:50:06 -07:00 |
|
MinchinWeb
|
9cad7ddb51
|
[Travis] Add Python to PATH on Windows
|
2019-11-28 08:39:22 -07:00 |
|
MinchinWeb
|
cdad3230f0
|
[Travis] include a test in not UTC
see #742
|
2019-11-28 08:35:53 -07:00 |
|
MinchinWeb
|
3c2ced0989
|
[Travis] no auto-ruby
|
2019-11-28 07:59:06 -07:00 |
|
MinchinWeb
|
b0f07eeb59
|
Appease the Travis gods
|
2019-11-28 07:49:33 -07:00 |
|
MinchinWeb
|
cab23ddc97
|
[Travis] add testing on Windows and Mac
See #739 (Python 3.8), #619 (Windows)
|
2019-11-28 07:43:05 -07:00 |
|
Jrnl Bot
|
4ecaf197f5
|
Incrementing version to v2.1.1-beta
|
2019-11-26 05:00:15 +00:00 |
|
micahellison
|
b5d33e3423
|
Merge pull request #756 from jrnl-org/develop
Merge develop into master for beta release
|
2019-11-25 20:56:48 -08:00 |
|
Jonathan Wren
|
0c1b577208
|
Merge pull request #751 from micahellison/readline-738
[GH-738] preventing readline usage on Windows
|
2019-11-25 20:42:33 -08:00 |
|
Jonathan Wren
|
c8bfa261c1
|
Merge pull request #755 from micahellison/on-today-bug-741
[GH-741] adding test for bug that displays all entries -on today
|
2019-11-25 20:41:05 -08:00 |
|
Micah Ellison
|
f633a93aab
|
Merge develop to on-today-bug-741
|
2019-11-25 20:37:10 -08:00 |
|
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 |
|
Micah Ellison
|
29545c3a81
|
[GH-741] adding test for bug that displays all entries -on today
|
2019-11-25 19:39:58 -08:00 |
|
Peter Schmidbauer
|
e925fe22f9
|
Add password confirmation dialog
|
2019-11-19 14:24:36 +01: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 |
|
Micah Ellison
|
3aae43e138
|
[GH-738] preventing readline usage on Windows - removes autocomplete on the install step for Windows users
|
2019-11-18 20:32:40 -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 |
|