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
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
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
