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
818 commits 12 branches 99 tags 13 MiB
Commit graph

818 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Peter Schmidbauer
d47e1ed479 fixup! remove py2 remnants and use mocks in tests 2019-11-01 19:58:32 +01:00
Peter Schmidbauer
5cee4fb783 run pyupgrade on plugin dir 2019-11-01 19:57:24 +01:00
Peter Schmidbauer
dace253513 fix broken pyupgrade fstring 2019-11-01 13:16:10 +01:00
Peter Schmidbauer
30caf9cae2 Run pyupgrade 2019-11-01 11:16:12 +01:00
Peter Schmidbauer
1c403904e5 fstring wip 2019-11-01 10:37:12 +01:00
Peter Schmidbauer
34f8f858f1 remove py2 remnants and use mocks in tests 2019-10-31 21:16:19 +01:00
Jonathan Wren
53677a9df1
Merge pull request #679 from C0DK/master 
Create templates for issues and pull requests
 2019-10-28 13:07:02 -07:00
Casper Weiss Bang
739ccb3d16 Create templates for issues and pull requests 2019-10-28 20:51:57 +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
micahellison
ef23d7eabe
Merge pull request #688 from wren/deployment-testing 
[#681] take out automated pages deployment (for now), since it broke the site
 2019-10-19 15:01:55 -07:00
Jonathan Wren
02ed94a0ec [#681] take out automated pages deployment (for now), since it broke the 
site
 2019-10-19 15:00:10 -07:00
micahellison
6d699fc240
Merge pull request #684 from wren/deployment-testing 
[#681] Separate local dev from pipeline releases
 2019-10-19 14:41:51 -07:00
Jonathan Wren
eca300551d [#681] Separate local dev from pipeline releases 2019-10-19 14:36:12 -07:00
micahellison
8433ade514
Merge pull request #683 from wren/deployment-testing 
[#681] Update version handling in source and travis deployments
 2019-10-19 13:53:58 -07:00
Jonathan Wren
675ef51ca1 [#681] Appease the poetry gods 2019-10-19 13:50:52 -07:00
Jonathan Wren
caeafb38a7 [#681] Update version handling in source and travis deployments 2019-10-19 13:41:59 -07:00
micahellison
47357492a4
Merge pull request #682 from wren/deployment-testing 
[#681] travis deployment testing
 2019-10-19 13:09:57 -07:00
Jonathan Wren
b4fda4d4c5 ¯\_(ツ)_/¯ 2019-10-19 13:03:57 -07:00
micahellison
350f0a1618
Merge pull request #670 from jrnl-org/v2.1 
v2.1
 2019-10-05 16:30:03 -07:00
Jonathan Wren
ee5d450cbe remove faulty conditional 2019-10-05 16:27:18 -07:00
Jonathan Wren
0328a748d3 update makefile to use poetry for more things 2019-10-05 16:07:34 -07:00
Jonathan Wren
9e0ed53643 update version and author emails 2019-10-05 16:06:16 -07:00
Jonathan Wren
f9e746fe24 Merge branch 'pr/merge-v2.1' 
Conflicts:
setup.py
 2019-10-05 16:00:52 -07:00
Jonathan Wren
a5519b9804 update requirements to include pyyaml >= 5.1 2019-10-05 15:59:39 -07:00
Jonathan Wren
1bbf074fe9
Merge pull request #660 from etnnth/yaml-version 
Change pyYAML required version
 2019-09-25 17:13:01 -07:00