Jonathan Wren
dc4ce6a3bb
Merge pull request #833 from jrnl-org/master
...
Merge master back into Develop
2020-02-08 12:01:45 -08:00
Jonathan Wren
fa971b0f2f
Merge branch 'develop' into master
2020-02-08 11:33:09 -08:00
Jrnl Bot
b747de42f6
Incrementing version to v2.2.1-beta2 [ci skip]
2020-02-06 06:28:47 +00:00
Jrnl Bot
f40e0de4b9
Updating changelog [ci skip]
2020-02-06 06:27:18 +00:00
Jrnl Bot
6bf0ccfb2b
Updating changelog [ci skip]
2020-02-05 20:34:10 +00:00
micahellison
961581c5b1
Merge pull request #829 from heymajor/patch-1
...
Update/clarify template explanation
2020-02-05 12:07:24 -08:00
micahellison
989870cb0f
Merge pull request #830 from wren/homebrew-fix-781
...
Remove poetry from build system in pyproject config to fix `brew install`
2020-02-05 12:06:46 -08:00
heymajor
436370b538
Smoothing out formatting issues
2020-02-01 17:52:33 -05:00
Jonathan Wren
57e39b592f
Take out build system from pyproject config #781
...
We don't use it, and it breaks the homebrew install.
2020-02-01 14:51:19 -08:00
Jrnl Bot
c4f7d481bd
Incrementing version to v2.2 [ci skip]
2020-02-01 21:24:21 +00:00
Jrnl Bot
0efd78cf3c
Updating changelog [ci skip]
2020-02-01 21:22:57 +00:00
heymajor
ba3f688e8f
Updating/expanding template explanation
2020-02-01 16:12:30 -05:00
Jrnl Bot
9383c6cda3
Incrementing version to v2.2-beta2
2020-02-01 12:34:29 -08:00
Jrnl Bot
5033bb3e30
Updating changelog [ci skip]
2020-01-26 01:35:23 +00:00
Jonathan Wren
0c9b2831e4
Merge pull request #823 from micahellison/travis-windows-tests
...
Fix all skipped tests on Travis Windows builds by preserving newlines
2020-01-25 17:25:08 -08:00
Jrnl Bot
ace4f576b2
Updating changelog [ci skip]
2020-01-26 01:13:04 +00:00
MinchinWeb
e54da41000
[DayOne] YAML export improvements ( #773 )
...
* [YAML Export] code style improvements
* [Dayone] Brings back extended Dayone attributes to YAML export
c.f. 7d3afd811bfd46ffea23
2020-01-25 17:01:55 -08:00
Micah Ellison
9cc8539ff9
Keep skip_win directive for empty entry test that still stalls on Travis
2020-01-25 15:57:58 -08:00
Micah Ellison
25a7577f0b
Remove all skip_win directives now that Travis is not mangling newlines on Windows
2020-01-25 15:40:05 -08:00
Micah Ellison
9f615191b4
Prevent Travis from turning LF to CRLF in Windows
2020-01-25 15:39:05 -08:00
Jrnl Bot
932a5b6cc3
Updating changelog [ci skip]
2020-01-25 22:12:27 +00:00
Jonathan Wren
b71f8fc430
Merge pull request #820 from wren/version-fix
...
Fix issue where jrnl would always out 'source' for version, fix Poetry config to build and publish properly
2020-01-25 13:44:13 -08:00
Jonathan Wren
caedf1ae7f
Merge pull request #819 from jrnl-org/develop
...
Merge latest develop into master for v2.2-beta2
2020-01-25 13:17:15 -08:00
micahellison
0e5581c4ce
Merge pull request #808 from wren/unpin-poetry
...
Unpin poetry
2020-01-25 12:26:04 -08:00
Jonathan Wren
879733a59f
update poetry version
2020-01-25 12:14:09 -08:00
Jonathan Wren
f10cb4d4f8
add maintainer field to config
2020-01-25 12:13:54 -08:00
Jonathan Wren
c88457f9ff
fix poetry warning
2020-01-25 11:52:47 -08:00
Jonathan Wren
a753f53f54
add version file to repo
2020-01-25 11:47:52 -08:00
Jrnl Bot
306e048f19
Updating changelog [ci skip]
2020-01-17 03:21:23 +00:00
Jonathan Wren
6ea492e25a
Merge pull request #789 from dbxnr/dbxnr-patch-1
...
Fix crash while encrypting a journal on first run without saving password
2020-01-16 19:06:58 -08:00
Jrnl Bot
b4be6fa161
Updating changelog [ci skip]
2020-01-17 03:03:35 +00:00
Jonathan Wren
c5ff25c7d5
Merge pull request #809 from aureooms/patch-1
...
Explain how fish can be configured to exclude jrnl commands from history by default
2020-01-16 18:54:18 -08:00
Jonathan Wren
8ed1ca86f0
Merge pull request #792 from micahellison/790-file-locking-windows
...
Close temp file before passing it to editor to prevent file locking issues in Windows
2020-01-16 18:52:22 -08:00
Aurélien Ooms
2433363ca8
Explain how fish can be configured to exclude jrnl commands from history by default
2020-01-16 14:51:22 +01:00
Jonathan Wren
fd591b82a3
unpin poetry version in requirments
2020-01-14 23:58:52 -08:00
Jrnl Bot
b522f761ee
Updating changelog [ci skip]
2020-01-15 06:33:18 +00:00
Jrnl Bot
284db07a05
Updating changelog [ci skip]
2020-01-15 06:16:04 +00:00
micahellison
e8981a6396
Merge pull request #807 from wren/auto-changelog-724
...
Change PyPI auth method in build pipeline
2020-01-14 22:04:52 -08:00
Jrnl Bot
43ff998ca3
Updating changelog [ci skip]
2020-01-15 05:57:01 +00:00
Jonathan Wren
af970cd47f
small fixes for travis pipeline
2020-01-14 21:48:42 -08:00
micahellison
c68cbaa0b7
Merge pull request #806 from wren/auto-changelog-724
...
Automagically update the changelog you see before your very eyes!
2020-01-14 21:44:58 -08:00
Jonathan Wren
4977924977
update deploy stage condition
2020-01-14 21:36:58 -08:00
Jonathan Wren
4d70c46b63
update changelog script to handle different scenarios ( #724 )
2020-01-14 21:31:04 -08:00
Jonathan Wren
778a37cd5e
add script to generate changelog
2020-01-14 20:06:14 -08:00
Jonathan Wren
7fba6c77a4
fix conditional for deploy step
2020-01-14 19:44:26 -08:00
Jonathan Wren
8ecc2baa9c
update changelog generator settings to be less verbose, fix links
2020-01-13 20:47:55 -08:00
Jonathan Wren
f564c8ca34
use api token instead of username and pw for pypi
2020-01-13 20:45:56 -08:00
Jonathan Wren
334c9b3e7a
add config file for changelog generator
2020-01-13 20:09:28 -08:00
Jonathan Wren
8eb0737e93
Merge pull request #797 from wren/changelog-update-724
...
Update changelog in prep for auto changelog generator
2020-01-12 20:37:07 -08:00
Jonathan Wren
59d865134a
Update changelog in prep for auto changelog generator ( #724 )
...
Getting ready to implement the auto-changelog generator is easier if we
are caught up with the old changes. This was generated by running the
generator locally.
Co-authored-by: Micah Jerome Ellison <git@micahjero.me>
2020-01-11 21:20:14 -08:00
