Jonathan Wren
a9f57a0ce9
Merge branch 'develop' into encryption-rework
2022-10-08 16:00:19 -07:00
Jonathan Wren
d066a3a8de
keep logic for password attemps inside the class that uses it
2022-10-08 15:55:30 -07:00
Jonathan Wren
196cb71beb
jrnlv1 encryption doesn't support encryption anymore (it's deprecated)
2022-10-08 15:30:36 -07:00
Jonathan Wren
120ad59b8d
fix more type hints
2022-10-08 15:30:14 -07:00
Jonathan Wren
15da50a9cf
don't use class variables because that's not what we want
2022-10-08 15:27:42 -07:00
Jrnl Bot
52f82fc855
Update changelog [ci skip]
2022-10-08 20:51:42 +00:00
Jrnl Bot
41e5d5ffff
Increment version to v3.3-beta
2022-10-08 20:49:59 +00:00
outa
d7242d81a4
Don't create empty file when attempting a YAML export to a non-existing folder ( #1600 )
...
* Call `export_journal` before opening file handle
* Use correct exporter class
* Fix unit test
2022-10-08 13:48:29 -07:00
Jrnl Bot
a925c81ba8
Update changelog [ci skip]
2022-10-08 20:43:20 +00:00
Micah Jerome Ellison
ceff398a01
Change default config to use journal key instead of journal name as key for file path ( #1594 )
2022-10-08 13:41:22 -07:00
Jrnl Bot
dd7f59cef7
Update changelog [ci skip]
2022-10-08 19:42:07 +00:00
Jonathan Wren
ff24ee604d
Update .gitignore ( #1604 )
...
* add ignore for directories used by this project
* update name of asdf version file (had a typo)
2022-10-08 12:40:27 -07:00
Jonathan Wren
0466cda64f
add more typing
2022-10-01 18:45:43 -07:00
Jonathan Wren
e695e7a30c
fix for python 3.11
2022-10-01 16:26:18 -07:00
Micah Jerome Ellison
ce4df8ee23
Fix obscure Windows line ending issue with decode
...
See https://bugs.python.org/issue40863
2022-10-01 14:25:23 -07:00
Jonathan Wren
fd6bdd79fb
fix linting issue
2022-10-01 13:00:19 -07:00
Jonathan Wren
44cafe6c16
Merge branch 'develop' into encryption-rework
...
Conflicts:
jrnl/output.py
2022-10-01 12:45:32 -07:00
Jonathan Wren
46a7aa0d2f
format
2022-10-01 10:18:11 -07:00
Jonathan Wren
3624bde2c0
more cleanup
2022-10-01 10:17:55 -07:00
Jonathan Wren
62b733729e
typing cleanup
2022-10-01 10:17:44 -07:00
Jonathan Wren
7c6e34deda
get rid of old PlainJournal class
2022-09-30 17:29:15 -07:00
Jonathan Wren
07d1db6b00
standardize the load and store methods in journals
2022-09-30 17:25:14 -07:00
Jonathan Wren
c6a564e722
store status code so tests don't fail
2022-09-25 18:39:21 -07:00
Jonathan Wren
ab70c56cf6
turn into enum instead of strings
2022-09-25 18:39:06 -07:00
Jonathan Wren
97f3290e02
general cleanup
2022-09-25 18:38:47 -07:00
Jonathan Wren
41a5af533d
update the upgrade process for new encryption classes
2022-09-25 15:52:14 -07:00
Jonathan Wren
358e6c7f68
more cleanup
2022-09-25 14:57:15 -07:00
Jonathan Wren
dbeb2c2128
move prompt into prompt.py
2022-09-24 15:33:07 -07:00
Jonathan Wren
a9c78272ad
more cleanup
2022-09-24 15:20:44 -07:00
Jrnl Bot
560d076a5f
Update changelog [ci skip]
2022-09-24 19:48:37 +00:00
Kevin
2df7acf488
Add machine readable --list output ( #1592 )
...
* Add machine readable --list output
* Refactor list_journals()
Create three new methods for each journal list format.
- JSON, YAML, STDOUT
* Added journal list export test
* Update test regex to handle windows filepaths
2022-09-24 12:46:49 -07:00
Jonathan Wren
454be3326e
fix linting issue
2022-09-24 08:47:21 -07:00
Jonathan Wren
49948c49f7
fix password bug in encryption
2022-09-24 08:47:11 -07:00
Jonathan Wren
a76f066a7c
more cleaning
2022-09-24 08:09:06 -07:00
Jonathan Wren
bb1f263d6c
rename function, fix some linting issues
2022-09-24 06:11:04 -07:00
Jonathan Wren
c52dcfef5a
little more cleanup
2022-09-24 06:00:24 -07:00
Jonathan Wren
b3a662fd9f
initial pass through to rework encryption into separate module
2022-09-24 05:49:55 -07:00
dependabot[bot]
057f31407a
Bump mako from 1.2.1 to 1.2.2 ( #1598 )
...
Bumps [mako](https://github.com/sqlalchemy/mako ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/sqlalchemy/mako/releases )
- [Changelog](https://github.com/sqlalchemy/mako/blob/main/CHANGES )
- [Commits](https://github.com/sqlalchemy/mako/commits )
---
updated-dependencies:
- dependency-name: mako
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-17 12:04:36 -07:00
Jonathan Wren
e9be61cae2
Change default timestamp to %F %r ( #1595 )
...
Fixes #1100
2022-09-17 12:02:52 -07:00
Jrnl Bot
66d26cfed6
Update changelog [ci skip]
2022-09-10 18:50:10 +00:00
Kevin
b5a22379b8
Update YAML export description in docs ( #1591 )
2022-09-10 11:48:20 -07:00
Jrnl Bot
405e0c2199
Update changelog [ci skip]
2022-09-03 21:23:14 +00:00
Jonathan Wren
bd02c52d5a
Fix Docs Accessibility Testing ( #1588 )
...
* update run_shell task to use newer python
* add shell arg back
* make tests run when certain files change
2022-09-03 14:21:27 -07:00
Jrnl Bot
8032aa9f2f
Update changelog [ci skip]
2022-09-03 20:25:31 +00:00
renovate[bot]
a95cd333d5
Update dependency typed.js to v2.0.12 ( #1578 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-09-03 13:23:37 -07:00
renovate[bot]
0618ff57e4
Update dependency jinja2 to v3.1.2 ( #1579 )
...
* Update dependency jinja2 to v3.1.2
* Remove old unneeded comment from requirements.txt
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2022-09-03 13:22:46 -07:00
Jrnl Bot
a3ce9bdb55
Update changelog [ci skip]
2022-09-03 20:18:05 +00:00
renovate[bot]
43d7dc026c
Pin dependencies ( #1577 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-09-03 13:16:28 -07:00
renovate[bot]
0d7acafc44
Update actions/checkout action to v3 ( #1582 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-09-03 13:16:18 -07:00
Jrnl Bot
080fcde440
Update changelog [ci skip]
2022-09-03 20:13:58 +00:00
