4 commits

Author	SHA1	Message	Date
Micah Jerome Ellison	248c6ddf2a	Merge branch 'develop' into directory-journal-config-encrypt ... # Conflicts: # tests/bdd/features/encrypt.feature	2021-08-21 13:51:14 -07:00
Micah Jerome Ellison	3e5a55b1e9	Display error when trying to encrypt folder/DayOne journal types (#1315) ... * Raise exception when trying to commit folder-based journal (including DayOne) * Add test to ensure this doesn't mess with encrypting normal journals * Consolidate and standardized tests	2021-08-21 13:46:29 -07:00
Micah Jerome Ellison	7cdba42dbc	Re-enable failing directory journal import tests	2021-07-31 14:05:44 -07:00
Jonathan Wren	f99411f2f9	move some files around because pytest is being weird	2021-07-03 15:49:18 -07:00