diff --git a/.travis.yml b/.travis.yml index af08d670..8c4ff73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,6 +115,8 @@ jobs: # ... and beyond! - name: Python nightly on Linux + before_install: + - sed -i 's/^python = ">=3\.6\.0.*"$/python = "*"/' pyproject.toml python: nightly # Specialty tests @@ -150,6 +152,6 @@ jobs: - git config --global user.email "jrnl.bot@gmail.com" - git config --global user.name "Jrnl Bot" - git checkout master - - git add pyproject.toml + - git add pyproject.toml jrnl/__version__.py - git commit -m "Incrementing version to ${TRAVIS_TAG} [ci skip]" - git push https://${GITHUB_TOKEN}@github.com/jrnl-org/jrnl.git master diff --git a/CHANGELOG.md b/CHANGELOG.md index 532245fb..2ac4c88f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,49 @@ ## [Unreleased](https://github.com/jrnl-org/jrnl/) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.3.1...HEAD) + +**Implemented enhancements:** + +- Merge in temp branches for v2.4 [\#897](https://github.com/jrnl-org/jrnl/pull/897) ([wren](https://github.com/wren)) + +**Fixed bugs:** + +- Fix typo in YAML exporter \("stared" -\> "starred"\) [\#907](https://github.com/jrnl-org/jrnl/pull/907) ([MinchinWeb](https://github.com/MinchinWeb)) + +**Build:** + +- Update Poetry requirements for testing latest Python version [\#898](https://github.com/jrnl-org/jrnl/pull/898) ([wren](https://github.com/wren)) + +**Updated documentation:** + +- Update twitter buttons, contribution in footer [\#905](https://github.com/jrnl-org/jrnl/pull/905) ([wren](https://github.com/wren)) +- Change install doc guideline from pip to pipx [\#904](https://github.com/jrnl-org/jrnl/pull/904) ([micahellison](https://github.com/micahellison)) + +## [v2.3.1](https://pypi.org/project/jrnl/v2.3.1/) (2020-03-28) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.3...v2.3.1) + +**Fixed bugs:** +- Syntax fix [\#886](https://github.com/jrnl-org/jrnl/pull/886) ([minchinweb](https://github.com/minchinweb)) + +**Build:** +- Hotfix to keep the version from releases in sync in repo [\#895](https://github.com/jrnl-org/jrnl/pull/895) ([wren](https://github.com/wren)) +- Update travis caching to speed up builds [\#871](https://github.com/jrnl-org/jrnl/pull/871) ([wren](https://github.com/wren)) + +**Updated documentation:** +- Update and reorganize CONTRIBUTING [\#885](https://github.com/jrnl-org/jrnl/pull/885) ([micahellison](https://github.com/micahellison)) +- Update url for "beautiful timeline" in export.md [\#879](https://github.com/jrnl-org/jrnl/pull/879) ([NGenetzky](https://github.com/NGenetzky)) + +## [v2.3](https://pypi.org/project/jrnl/v2.3/) (2020-03-21) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2...v2.3) **Implemented enhancements:** - Update YAML exporter to handle Dayone format [\#773](https://github.com/jrnl-org/jrnl/pull/773) ([MinchinWeb](https://github.com/MinchinWeb)) +- Pretty print journal entries (add color) [\#692](https://github.com/jrnl-org/jrnl/pull/692) ([alichtman](https://github.com/alichtman)) +- Allow journals to be saved into multiple files in a directory structure [\#485](https://github.com/jrnl-org/jrnl/pull/485) ([notbalanced](https://github.com/notbalanced)) **Fixed bugs:** @@ -37,10 +75,8 @@ [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.1.1...v2.2) - **Implemented enhancements:** -- Update YAML exporter to handle Dayone format [\#773](https://github.com/jrnl-org/jrnl/pull/773) ([MinchinWeb](https://github.com/MinchinWeb)) - Full text search \(case insensitive\) with "-contains" [\#740](https://github.com/jrnl-org/jrnl/pull/740) ([empireshades](https://github.com/empireshades)) - Reduce startup time by 55% [\#719](https://github.com/jrnl-org/jrnl/pull/719) ([maebert](https://github.com/maebert)) - Refactor password logic to prevent accidental password leakage [\#708](https://github.com/jrnl-org/jrnl/pull/708) ([pspeter](https://github.com/pspeter)) diff --git a/docs/installation.md b/docs/installation.md index 8bf29bb0..4c80eb0d 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -3,16 +3,16 @@ ## Installation On OS X, the easiest way to install *jrnl* is using -[Homebrew](http://brew.sh/) +[Homebrew](http://brew.sh/): ``` sh brew install jrnl ``` -On other platforms, install *jrnl* using pip +On other platforms, install *jrnl* using [Python](https://www.python.org/) 3.6+ and [pipx](https://pipxproject.github.io/pipx/): ``` sh -pip install jrnl +pipx install jrnl ``` The first time you run `jrnl` you will be asked where your journal file diff --git a/docs/theme/index.html b/docs/theme/index.html index 2221e76f..89aa3641 100755 --- a/docs/theme/index.html +++ b/docs/theme/index.html @@ -42,7 +42,7 @@
@@ -58,7 +58,7 @@
@@ -95,7 +95,7 @@