1027 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
dbxnr	18acde7281	Merge branch 'dayone2' of github.com:dbxnr/jrnl into dayone2	2020-01-21 17:31:16 +00:00
dbxnr	e136ca60c1	Merge remote-tracking branch 'upstream/develop' into dayone2	2020-01-21 17:30:54 +00:00
dbxnr	a016aee7d4	Delete dayone2.py, fix small bug with import_file() error handling	2020-01-21 17:30:30 +00:00
dbxnr	c16afe1605	Add support for DayOne2	2020-01-21 17:30:30 +00:00
dbxnr	d9161f2fe7	Merge branch 'develop' of https://github.com/jrnl-org/jrnl into dayone2	2020-01-21 17:27:09 +00:00
dbxnr	01546672be	Delete dayone2.py, fix small bug with import_file() error handling	2020-01-21 17:22:18 +00:00
dbxnr	6f84eec165	Add support for DayOne2	2020-01-21 17:08:20 +00: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
Micah Ellison	41c4c241cc	#790 - closing temp file before passing it to editor to prevent file locking issues in Windows	2020-01-09 20:34:38 -08:00
dbxnr	ef18cb4144	Fix for unhandled exception	2020-01-09 18:20:48 +00:00
micahellison	9d9f61ac1e	Merge pull request #772 from wren/windows-tests-766 ... Skip Broken Windows Tests	2020-01-04 14:27:42 -08:00
Jonathan Wren	6fc1313b47	skip more windows tests	2020-01-04 13:49:05 -08:00
Jonathan Wren	a3e24bcc9f	run black	2020-01-04 13:42:25 -08:00
Jonathan Wren	549d771956	skip another windows test	2020-01-04 13:42:04 -08:00
Jonathan Wren	3f8133cda5	whitespace changes	2020-01-04 13:42:03 -08:00
Jonathan Wren	efa21831ed	skip another windows test	2020-01-04 13:42:02 -08:00
Jonathan Wren	2d92201157	remove broken test (windows can't handle emoji)	2020-01-04 13:42:01 -08:00
Jonathan Wren	5434d476de	[#766] Skip another broken windows test	2020-01-04 13:42:00 -08:00
Jonathan Wren	686ccaae3b	[#766] Skip the broken test on windows for now	2020-01-04 13:41:58 -08:00
micahellison	0f53329592	Merge pull request #774 from eshrh/fix-usage-notes ... Fix usage notes	2020-01-04 12:44:47 -08:00
Jonathan Wren	a5d2e1625c	Merge pull request #782 from markphelps/patch-1 ... Remove merge marker in recipes.md	2020-01-04 12:42:13 -08:00
Jonathan Wren	82c69d0053	Merge pull request #784 from wren/build-fix-black ... Update Black version and lock file to fix builds on develop branch	2020-01-04 12:38:21 -08:00
Jonathan Wren	676cac7e80	Change stage so travis doesn't get confused about allowed failures	2020-01-04 12:30:50 -08:00
Jonathan Wren	06970f3911	run black to get codebase into good base state	2020-01-04 12:12:00 -08:00
Jonathan Wren	e2ce40424e	clarify build steps	2020-01-04 12:08:38 -08:00