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

843 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Micah Ellison
e10fb7f933 [GH-666] updating documentation to reflect v2 behavior: 
* new config location and file type
* removing mentions of DayOne support
* removing mention of pip install jrnl[encrypted]
 2019-11-11 19:02:22 -08:00
Rory O’Kane
cc44cb1e17 In Encryption docs, improve grammar and typography 2019-11-11 18:57:04 -08:00
Rory O’Kane
a7d5618025 In Encryption docs, explain how to prevent Fish history logging 2019-11-11 18:57:04 -08:00
Greg Bodnar
3ef086c71a Add doc about extracting timestamps with no spaces 
Timestamp formats may have no space between date and time components and cause the script to fail.
 2019-11-11 18:57:04 -08:00
Greg Bodnar
ad55402a11 Add recipe to display random entry 2019-11-11 18:57:04 -08:00
Jrnl Bot
cdb04974e2 Incrementing version to v2.1.post2 2019-11-12 02:43:42 +00:00
MinchinWeb
1bf01aa748 fix typos, spelling (#734) 2019-11-11 12:03:05 -08:00
Jrnl Bot
bb15e68fc7 Incrementing version to v2.1-beta6 2019-11-09 22:26:33 +00:00
micahellison
961d493cc9
Merge pull request #731 from wren/715-version-update 
[#715] Make bot that will auto-increment version in code after deploy
 2019-11-09 14:24:07 -08:00
Jonathan Wren
721656cb07 [#715] Make bot that will auto-increment version in code after deploy 2019-11-09 14:17:13 -08:00
MinchinWeb
971560edac [Upgrade to 2.0] Expand User directory (#704) 2019-11-07 17:20:57 -08:00
Jonathan Wren
3a53dbcbfc
Merge pull request #712 from jrnl-org/maebert-patch-1 
Update issue templates
 2019-11-06 09:00:06 -07:00
Manuel Ebert
ffc2e6245e Updating Issue Template Workflow 2019-11-04 15:30:47 -08:00
Peter Schmidbauer
7d9795ace6 fixup! remove py2 remnants and use mocks in tests 2019-11-04 16:36:16 +01:00
Peter Schmidbauer
827a598dd8 Drop use of codecs package 
Use builtins.open() instead
 2019-11-01 21:48:04 +01:00
Peter Schmidbauer
65adb92ed4 small print bugfix 
The file=sys.stderr was part of the format(), so an error got printed to stdout
 2019-11-01 20:05:06 +01:00