Micah Ellison
8a4fe0ec81
Fix FolderJournal path tests for Windows paths
2020-02-29 13:29:19 -08:00
Micah Ellison
71f918d878
Remove DayOne test made obsolete by FolderJournal
2020-02-29 12:45:47 -08:00
Jonathan Wren
97cf65e516
Merge branch 'develop' into v2.5
2020-02-08 14:29:10 -08:00
MinchinWeb
e5d7845f18
Listing all entries in DayOne Classic journal throws IndexError ( #786 )
...
* Reproduce bug in #780
🎵 I have no body, no body to love me... 🎵
The bug is cause by a DayOne entry that has to entry body.
* Deal with empty bodies
Close #780 .
* [Travis-CI] add "tree" command to debug missing files
* Fix file location
I have no idea why, but it ran locally fine without issue. Travis is more particular...
2020-02-08 13:14:33 -08:00
MinchinWeb
550347eab1
Add UTC support for failing DayOne tests ( #785 )
...
* [Dayone] don't break if the system timezone is UTC
* [DayOne] re-enable tests that were failing on Travis
* [DayOne] change as per code review to avoid `except: pass`
2020-02-08 12:34:52 -08:00
Stav Shamir
630a8fcaec
Add test scenarios for the export feature ( #824 )
...
* Fix behave keyword "and" to correct case "And"
* Extract export_steps module
* Add scenario for XML export
* Add scenario for tags export
* Add scenario for fancy export
* Add scenario for yaml export
* Remove unused module export.py
* Run `make format`
* Fix `create_directory` step
2020-02-08 12:18:01 -08:00
Micah Ellison
9cc8539ff9
Keep skip_win directive for empty entry test that still stalls on Travis
2020-01-25 15:57:58 -08:00
Micah Ellison
25a7577f0b
Remove all skip_win directives now that Travis is not mangling newlines on Windows
2020-01-25 15:40:05 -08:00
Jonathan Wren
6fc1313b47
skip more windows tests
2020-01-04 13:49:05 -08:00
Jonathan Wren
a3e24bcc9f
run black
2020-01-04 13:42:25 -08:00
Jonathan Wren
549d771956
skip another windows test
2020-01-04 13:42:04 -08:00
Jonathan Wren
3f8133cda5
whitespace changes
2020-01-04 13:42:03 -08:00
Jonathan Wren
efa21831ed
skip another windows test
2020-01-04 13:42:02 -08:00
Jonathan Wren
2d92201157
remove broken test (windows can't handle emoji)
2020-01-04 13:42:01 -08:00
Jonathan Wren
5434d476de
[ #766 ] Skip another broken windows test
2020-01-04 13:42:00 -08:00
Jonathan Wren
686ccaae3b
[ #766 ] Skip the broken test on windows for now
2020-01-04 13:41:58 -08:00
Jonathan Wren
06970f3911
run black to get codebase into good base state
2020-01-04 12:12:00 -08:00
Jonathan Wren
e984a9a015
Merge branch 'develop' into black
2019-12-21 12:11:05 -08:00
Jonathan Wren
07a633ae51
( #770 ) run black formatter on codebase for standardization
2019-12-21 11:47:02 -08:00
MinchinWeb
e7cbbecaef
[Black] sync to develop branch and apply black
...
# Conflicts:
# jrnl/EncryptedJournal.py
# jrnl/Journal.py
# jrnl/__init__.py
# jrnl/cli.py
# jrnl/install.py
2019-12-14 13:48:17 -07:00
Jonathan Wren
a9e4e09547
Merge pull request #708 from pspeter/simplify-password-logic
...
Refactor password logic to prevent accidental password leakage
2019-12-10 21:04:59 -08:00
Jonathan Wren
cb9d546141
Merge pull request #740 from empireshades/master
...
Full text search (case insensitive) with "-contains"
2019-12-10 20:25:36 -08:00
MinchinWeb
d8f422151d
Apply black formatter to code
2019-12-07 12:32:55 -07:00
Jims
9b6b788af4
Renamed searching to contains. Made changes as per pull-request: https://github.com/jrnl-org/jrnl/pull/740
2019-12-01 23:03:38 -05:00
Peter Schmidbauer
444d6de9e4
Move all password handling to EncryptedJournal
...
This commit should greatly simplify all password handling logic. No passwords are stored in the config dict anymore. Only the Encrypted Journals have any password related logic. I also had to remove some password fields from the test files, which shows how dangerous the previous approach was. A slight code change could've leaked passwords to the config file. However, I had to change the install progress a little bit to make this work. It will now not ask you for a password right away but rather if you want to encrypt or not. Only if you reply 'y' will it ask you for the password later on.
2019-11-29 17:07:35 +01: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
MinchinWeb
cdad3230f0
[Travis] include a test in not UTC
...
see #742
2019-11-28 08:35:53 -07: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
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
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
59a6aa3cfd
Remove extraneous code
2019-11-16 14:54:03 +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
8d22283b93
Update features/steps/core.py
...
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-16 14:35:50 +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