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

968 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jonathan Wren
8384b799a1
update lock file 2020-01-04 12:01:51 -08:00
Jonathan Wren
31138c0463
update black version 2020-01-04 12:01:21 -08:00
Mark Phelps
6d8b5a59b3
Remove merge marker in recipes.md 
Remove <<<<<<< HEAD marker in recipes.md
 2020-01-04 11:58:49 -05:00
Jonathan Wren
2e920a7e8f
Merge pull request #769 from MinchinWeb/black 
Black Formatter
 2019-12-21 12:57:32 -08:00
Jonathan Wren
e984a9a015
Merge branch 'develop' into black 2019-12-21 12:11:05 -08:00
micahellison
717078bcfc
Merge pull request #778 from wren/black-format-770 
[#770] run black formatter on codebase for standardization
 2019-12-21 12:00:36 -08:00
Jonathan Wren
07a633ae51
(#770) run black formatter on codebase for standardization 2019-12-21 11:47:02 -08:00
Eshan
411a790f29
Fix usage notes 
Notes were correctly indented.
 2019-12-15 00:04:42 -05:00
MinchinWeb
c8172efdcc [Travis] black -- show a diff on things that need to be reformatted 2019-12-14 14:00:28 -07:00