fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-18 20:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1335 commits 12 branches 99 tags 13 MiB
Commit graph

1335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Wren
9cd2250a61 Add config overrides steps to pytest 
This requires some patching around the config object, which now happens
in every test.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-10-02 16:52:47 -07:00
Jonathan Wren
e16e3a1f62 update yaml loader to new method 2021-10-02 13:47:44 -07:00
Jonathan Wren
7d8823da6d
Move remaining tests from behave to pytest (#1346) 
* add newer tests to pytest (from behave)

* remove 'lib' from gitignore (since we're using it)

* fix capitalization in some steps

* add 'the editor should not have been called' step

* comment out config override step in pytest-bdd since it's not implemented yet

* remove test that didn't really test anything

* implement some missing steps in pytest-bdd

* change comment to match other tests
 2021-10-02 13:31:21 -07:00
Jrnl Bot
593245f3fd Update changelog [ci skip] 2021-10-02 19:24:53 +00:00
dependabot[bot]
60c9ed124d
Bump cryptography from 3.4.8 to 35.0.0 (#1345) 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.8 to 35.0.0.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.4.8...35.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-10-02 12:23:17 -07:00
Micah Jerome Ellison
4c0fb344d1
Add CACHE_STRING secret to bust GitHub Actions python cache (#1344) 
* Add CACHE_STRING secret to allow maintainers to bust cache without a commit

* Quick change

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-09-25 11:11:28 -07:00
Jrnl Bot
9f16cc42f5 Update changelog [ci skip] 2021-09-18 23:28:00 +00:00
Micah Jerome Ellison
614be34081
Document journal types (#1331) 
* Add docs section for journal types
* Include new journal types docs section in site nav
* Add section on changing a journal type and clean up work from previous commit
 2021-09-18 16:26:28 -07:00
Jrnl Bot
b932cfc9ad Update changelog [ci skip] 2021-09-18 19:53:58 +00:00
dependabot[bot]
73806c2d30
Bump keyring from 23.1.0 to 23.2.1 (#1342) 
Bumps [keyring](https://github.com/jaraco/keyring) from 23.1.0 to 23.2.1.
- [Release notes](https://github.com/jaraco/keyring/releases)
- [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst)
- [Commits](https://github.com/jaraco/keyring/compare/v23.1.0...v23.2.1)

---
updated-dependencies:
- dependency-name: keyring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-18 12:52:14 -07:00
Jrnl Bot
79e3c94669 Update changelog [ci skip] 2021-09-18 19:51:58 +00:00
dependabot[bot]
f67e8947a5
Bump black from 21.8b0 to 21.9b0 (#1343) 
Bumps [black](https://github.com/psf/black) from 21.8b0 to 21.9b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-18 12:50:26 -07:00
Jrnl Bot
d968730adf Update changelog [ci skip] 2021-09-18 19:33:41 +00:00
Micah Jerome Ellison
fabdac887e
Fix splash image for PyPi (I hope) and add changelog badge (#1339) 2021-09-18 12:31:45 -07:00
Jrnl Bot
6f6ee7b54f Update changelog [ci skip] 2021-09-06 19:57:05 +00:00
dependabot[bot]
087b038d77
Bump black from 21.7b0 to 21.8b0 (#1333) 
Bumps [black](https://github.com/psf/black) from 21.7b0 to 21.8b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-06 12:55:29 -07:00
Jrnl Bot
73145888e6 Update changelog [ci skip] 2021-09-06 19:55:02 +00:00
dependabot[bot]
3615abd4e2
Bump pytest from 6.2.4 to 6.2.5 (#1334) 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-06 12:53:18 -07:00
Jrnl Bot
72f2d14427 Update changelog [ci skip] 2021-09-06 19:44:30 +00:00
Jrnl Bot
8ccaf4ac1d Increment version to v2.8.3 2021-09-06 19:43:07 +00:00
Jrnl Bot
778c1de6eb Update changelog [ci skip] 2021-08-28 23:00:37 +00:00
Jrnl Bot
a32aefe541 Increment version to v2.8.3-beta 2021-08-28 22:58:59 +00:00
Jrnl Bot
3c561af93d Update changelog [ci skip] 2021-08-28 20:22:11 +00:00
dependabot[bot]
7eaeef821e
Bump cryptography from 3.4.7 to 3.4.8 (#1329) 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.7 to 3.4.8.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.4.7...3.4.8)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-08-28 13:20:25 -07:00
Jrnl Bot
7030185e4f Update changelog [ci skip] 2021-08-28 20:20:16 +00:00
Micah Jerome Ellison
5abf974682
Fix deletion of entries on folder journal through --delete flag (#1328) 
* Re-enable failing folder/DayOne tests
* Disable dayone tests again - out of scope for this problem
* Fix folder journal deletion by tracking which dates are associated with deleted entries
 2021-08-28 13:18:34 -07:00
Micah Jerome Ellison
fa146b1434
Warn when DayOne/directory journals have encrypt: true in config (#1325) 
* Raise exception when trying to commit folder-based journal (including DayOne)
* Change negative bool name to a positive
* Add test to ensure this doesn't mess with encrypting normal journals
* Consolidate and standardized tests
* Add failing test for new error message about unencryptable journals
* Warn when encrypt is true and journal type is directory/DayOne
 2021-08-21 14:47:49 -07:00
Jrnl Bot
c52e878c01 Update changelog [ci skip] 2021-08-21 21:44:38 +00:00
Micah Jerome Ellison
050c17ee06
Allow emoji in config file in Windows by always opening it as unicode (#1313) 
* Open config file as utf-8 always
* Add test for journal with emoji name
 2021-08-21 14:43:11 -07:00
Micah Jerome Ellison
7109374d42
Fix failure to import into directory journal (#1314) 
* Re-enable failing directory journal import tests
* Appropriately track journal name and modified entries in FolderJournal when importing
* Run make format
 2021-08-21 14:42:31 -07:00
Jonathan Wren
08350b884b
take out redundant lines from PR template (#1327) 2021-08-21 14:00:31 -07:00
Jrnl Bot
bacbf8109b Update changelog [ci skip] 2021-08-21 20:48:08 +00: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
Jrnl Bot
9de723d014 Update changelog [ci skip] 2021-08-21 19:10:25 +00:00
Micah Jerome Ellison
a0a3ef669e
Set bash as default shell (#1324) 2021-08-21 12:08:44 -07:00
Jrnl Bot
1c63d94736 Update changelog [ci skip] 2021-08-17 03:24:18 +00:00
dependabot[bot]
32b5a2b5d0
Bump keyring from 23.0.1 to 23.1.0 (#1318) 
Bumps [keyring](https://github.com/jaraco/keyring) from 23.0.1 to 23.1.0.
- [Release notes](https://github.com/jaraco/keyring/releases)
- [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst)
- [Commits](https://github.com/jaraco/keyring/compare/v23.0.1...v23.1.0)

---
updated-dependencies:
- dependency-name: keyring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-08-16 20:22:39 -07:00
Jonathan Wren
3b93e92960
take out arg for old plugin from makefile (#1322) 2021-08-16 20:13:44 -07:00
Jrnl Bot
5ec7dec9f0 Update changelog [ci skip] 2021-08-17 02:47:47 +00:00
Jonathan Wren
8a64b77e63
Update build to poetry alpha 2 for python 3.10 (#1320) 
* udpate build to poetry alpha 2 for python 3.10

* update testing workflow to run when workflow itself is changed
 2021-08-16 19:46:01 -07:00
Jrnl Bot
b23c831da5 Update changelog [ci skip] 2021-07-31 19:11:33 +00:00
Jrnl Bot
eaaa7bb0e1 Increment version to v2.8.2 2021-07-31 19:10:05 +00:00
Jrnl Bot
c49853d724 Update changelog [ci skip] 2021-07-31 18:47:00 +00:00
dependabot[bot]
642155292a
Bump mkdocs from 1.2.1 to 1.2.2 (#1307) 
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](https://github.com/mkdocs/mkdocs/compare/1.2.1...1.2.2)

---
updated-dependencies:
- dependency-name: mkdocs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-07-31 11:45:19 -07:00
Micah Jerome Ellison
c9c6e7efc1
Fix typo in --help (#1309) 2021-07-31 11:43:19 -07:00
Jrnl Bot
1ba1b756c9 Update changelog [ci skip] 2021-07-17 22:17:56 +00:00
Jrnl Bot
f158d7f266 Increment version to v2.8.2-beta 2021-07-17 22:16:08 +00:00
Jrnl Bot
cef3a98b4e Update changelog [ci skip] 2021-07-17 20:23:48 +00:00
Micah Jerome Ellison
31f782e333
Add documentation about saved passwords in Windows (#1301) 
* Add note about saved passwords
* Add missing yq dep back in to allow xq to run in mkdocs CI pipeline
 2021-07-17 13:22:01 -07:00
Jrnl Bot
3e95a46bd2 Update changelog [ci skip] 2021-07-17 19:15:00 +00:00