fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
884 commits 12 branches 99 tags 13 MiB
Commit graph

127 commits

Author SHA1 Message Date
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
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
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
25c0feaab6
Merge branch 'master' into fix-custom-dates 2019-11-11 21:08:37 -08:00
Peter Schmidbauer
34f8f858f1 remove py2 remnants and use mocks in tests 2019-10-31 21:16:19 +01:00
Peter Schmidbauer
1fa851ed0c Fix handling of little-endian date format 
Ever since version 2.0, when parsing a journal file, jrnl would not use the custom date format string anymore. Instead, it relied on the dateutil library to get the parsing right. This change was made to allow people to change their date format without having to manually change their file. However, this broke some existing date formats like %d.%m.%Y, as it would falsely interpret the month as day and vice versa. This commit adds some tests to catch this error and fixes it by trying to parse the dates using the custom format first, only falling back to dateutil when needed.
 2019-10-26 21:58:15 +02:00
Jonathan Wren
b8a2c2df9d
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
micahellison
fe48a928d8
Merge pull request #657 from jrnl-org/v2.0.1 
Prep v2.0.1
 2019-09-21 12:13:44 -07:00
Micah Jerome Ellison
3bfd9f487b [GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not 2019-08-24 13:50:10 -07:00
Jonathan Wren
6d3c35b2f7
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
micahellison
ec1b2c63b9
Merge pull request #641 from gregorybodnar/create_encrypted_journal 
Fix for #631 Create encrypted journal
 2019-08-13 12:17:12 -07:00
Jonathan Wren
1350bcad1b #631 Escape data in square brackets 2019-08-10 13:37:03 -07:00
Justin Proffitt
31a4607a7d Add tests for the excluding tags with -not 2019-08-07 20:58:35 -04:00
Greg Bodnar
02f853b545 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
18ba16ad66 Add failing test for configuring an encrypted journal 2019-08-03 16:48:10 +12:00
MinchinWeb
1884a6ce23 [Markdown Export] deal with linebreaks in jrnl files 2019-08-01 21:00:53 -06:00
Micah Jerome Ellison
f3b9a91c9b [GH-614] resolving issues around unreadable dates and unparsed dates 2019-07-20 14:51:46 -07:00
Micah Jerome Ellison
2a401823b5 #5 Removing DayOne tests 2019-06-22 14:35:27 -07:00
Jonathan Wren
bcfd2d4b43 Fix issue #584 YAMLLoadWarning (#585) 2019-04-14 09:47:31 -07:00
Manuel Ebert
4b3dc38e05 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
b3f5c092de Fix Keyring tests 2016-08-19 21:43:27 +00:00