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
etienne
9bc0340280
Change pyYAML required version
...
Full Loader only avalaible from v5.1:
2019-09-24 17:13:05 +02:00
Jonathan Wren
b1680fd90b
Merge pull request #655 from jrnl-org/manu--contributing
...
Fix references to Sphinx in CONTRIBUTING.md
2019-09-21 12:38:23 -07: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
Jonathan Wren
20916eab54
Merge pull request #550 from silenc3r/master
...
Handle KeyboardInterrupt when installing journal
2019-09-21 12:36:49 -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
Manuel Ebert
f9ff519679
Fix references to Sphinx in contributing.md
2019-09-18 10:33:01 -07:00
Jonathan Wren
2767567dc1
Merge pull request #650 from micahellison/632-upgrade-tests
...
[GH-632] confirming that each journal can be parsed during upgrade
2019-08-24 15:51:00 -07:00
Jonathan Wren
542f23a180
Merge pull request #649 from jrnl-org/manu--docs
...
Smaller doc fixes
2019-08-24 15:48:19 -07:00
Micah Jerome Ellison
be35904912
[GH-632] adding call to action to report issue when upgrade fails
2019-08-24 15:47:13 -07:00
Micah Jerome Ellison
244165664b
[GH-632] removing unreachable return statement
2019-08-24 15:25:05 -07:00
Micah Jerome Ellison
4d0640e613
[GH-632] removing unnecessary whitespace
2019-08-24 15:14:15 -07:00
Micah Jerome Ellison
a4e881942a
[GH-632] raising exception in upgrade.py on fail
...
Handling it in install.py to prevent config from being overwritten when upgrade fails
2019-08-24 15:01:23 -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
Manuel Ebert
47117b4ef5
Found and removed another angsty teenager
2019-08-23 18:39:49 -07:00
Manuel Ebert
2c99441803
Smaller doc fixes, fixes #486
2019-08-23 18:38:05 -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
Jonathan Wren
4c516a83b8
Merge pull request #612 from jrnl-org/manu--poetry
...
Use Poetry for dependency management and deployments
2019-08-15 17:50:15 -07:00
Manuel Ebert
6a717029a7
Add deployment through poetry to travis
2019-08-15 17:44:27 -07:00
Manuel Ebert
9d40f867b7
Add Poetry config
2019-08-15 17:42:45 -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
micahellison
a6044b65bc
Merge pull request #644 from wren/escape-dates-GH-631
...
#631 Escape data in square brackets
2019-08-13 12:16:08 -07:00
micahellison
945a18ac7d
Merge pull request #646 from wren/stalebot-60
...
change pinned label to a super cool emoji ⭐ ️
2019-08-10 16:49:17 -07:00
Jonathan Wren
8fe8f9d5c9
change pinned label to a super cool emoji ⭐ ️
2019-08-10 16:45:54 -07:00
micahellison
c09ac67d9c
Merge pull request #645 from wren/stalebot-60
...
move stablebot back up to 60 days now that backlog is a bit more cleared out
2019-08-10 16:35:21 -07:00
Jonathan Wren
d9d83447d0
move stablebot back up to 60 days now that backlog is a bit more cleared out
2019-08-10 16:21:38 -07:00
Jonathan Wren
1350bcad1b
#631 Escape data in square brackets
2019-08-10 13:37:03 -07:00
Jonathan Wren
e189ac12fe
fix a few linting errors
2019-08-10 12:17:36 -07:00
