jrnl/jrnl
Suhas d55fa4134a
Lockfile merge (#7)
* Add brew and gitter badges to README

* Update changelog [ci skip]

* Make journal selection behavior more consistent when there's a colon with no date (#1164)

* Bump pytest from 6.2.1 to 6.2.2 (#1167)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump keyring from 21.8.0 to 22.0.1 (#1168)

Bumps [keyring](https://github.com/jaraco/keyring) from 21.8.0 to 22.0.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/v21.8.0...v22.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update changelog [ci skip]

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
Co-authored-by: Jrnl Bot <jrnl.bot@gmail.com>
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-01 13:22:55 -05:00
..
plugins Add new date format (--format date) for heatmapping (#1146) 2021-01-16 14:50:47 -08:00
templates Template exporting FTW 2016-08-19 23:20:31 +00:00
__init__.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
__main__.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
__version__.py Increment version to v2.7 2021-01-23 22:49:45 +00:00
args.py variable renames 2021-01-31 20:31:23 -05:00
cli.py Notify user when config directory can't be created because there is already a file with the same name (#1134) 2021-01-02 15:19:44 -08:00
color.py Fix OS compatibility issues for editors with spaces, slashes, and quotes (#1153) 2021-01-16 15:19:11 -08:00
commands.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
config.py Lockfile merge (#7) 2021-02-01 13:22:55 -05:00
DayOneJournal.py Clean up help screen, get rid of util.py (#1027) 2020-08-22 11:40:39 -07:00
editor.py Fix OS compatibility issues for editors with spaces, slashes, and quotes (#1153) 2021-01-16 15:19:11 -08:00
EncryptedJournal.py Fix keyring error handling (#1138) 2021-01-02 13:26:45 -08:00
Entry.py Support title splitting for fullwidth CJK terminals (#1163) 2021-01-23 15:29:43 -08:00
exception.py Notify user when config directory can't be created because there is already a file with the same name (#1134) 2021-01-02 15:19:44 -08:00
FolderJournal.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
install.py Notify user when config directory can't be created because there is already a file with the same name (#1134) 2021-01-02 15:19:44 -08:00
Journal.py Add new -today-in-history, -month, -day, and -year search filters (#1145) 2021-01-16 14:55:27 -08:00
jrnl.py guard override application 2021-01-25 21:03:19 -05:00
os_compat.py Fix OS compatibility issues for editors with spaces, slashes, and quotes (#1153) 2021-01-16 15:19:11 -08:00
output.py Notify user when config directory can't be created because there is already a file with the same name (#1134) 2021-01-02 15:19:44 -08:00
override.py variable renames 2021-01-31 20:31:23 -05:00
prompt.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
time.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00
upgrade.py Comply with GPL by acknowledging all authors and including license info in each source file (#1121) 2020-12-19 22:28:22 -08:00