diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-03-04 12:06:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 12:06:22 +0100 |
| commit | 36fd8e5fde30145cb6d9b8ce210f6d81ee6d2adc (patch) | |
| tree | 3d22d15f0eb0fa2495f9bd9735b7b5626d678e4c | |
| parent | 4ae4fa7b8969d8d158ec71645a8443518676a2ed (diff) | |
| parent | f2aa3730549cacc5dbb00279a8b0cf980b23d67c (diff) | |
| download | wallabag-36fd8e5fde30145cb6d9b8ce210f6d81ee6d2adc.tar.gz wallabag-36fd8e5fde30145cb6d9b8ce210f6d81ee6d2adc.tar.zst wallabag-36fd8e5fde30145cb6d9b8ce210f6d81ee6d2adc.zip | |
Merge pull request #3895 from wallabag/prepare-2.3.7
Prepare 2.3.7 release
| -rw-r--r-- | CHANGELOG.md | 18 | ||||
| -rw-r--r-- | app/config/wallabag.yml | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c116efb1..495bd1d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,23 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | 2 | ||
| 3 | ## [2.3.7](https://github.com/wallabag/wallabag/tree/2.3.7) | ||
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.6...2.3.7) | ||
| 5 | |||
| 6 | ### Fixes | ||
| 7 | |||
| 8 | - Jump to 2.3.7-dev [#3837](https://github.com/wallabag/wallabag/pull/3837) | ||
| 9 | - Fix bad order parameter in the API [#3841](https://github.com/wallabag/wallabag/pull/3841) | ||
| 10 | - Update composer.json to add php-tidy (ext-tidy) [#3853](https://github.com/wallabag/wallabag/pull/3853) | ||
| 11 | - Add dedicated email for site config issue [#3861](https://github.com/wallabag/wallabag/pull/3861) | ||
| 12 | - Fix read & starred status in Pocket import [#3819](https://github.com/wallabag/wallabag/pull/3819) | ||
| 13 | - Fix broken 2 factor auth logo image [#3869](https://github.com/wallabag/wallabag/pull/3869) | ||
| 14 | - Fix CORS for API [#3882](https://github.com/wallabag/wallabag/pull/3882) | ||
| 15 | - Add support of expect parameter to change return object when deleting entry [#3887](https://github.com/wallabag/wallabag/pull/3887) | ||
| 16 | - epub export: fix missing cover image, only for exports of one article [#3886](https://github.com/wallabag/wallabag/pull/3886) | ||
| 17 | - Allow optional --ignore-root-warning [#3885](https://github.com/wallabag/wallabag/pull/3885) | ||
| 18 | - material: fix left padding of content on medium screens [#3893](https://github.com/wallabag/wallabag/pull/3893) | ||
| 19 | - material: hide creation date from card actions on specific sizes [#3894](https://github.com/wallabag/wallabag/pull/3894) | ||
| 20 | |||
| 3 | ## [2.3.6](https://github.com/wallabag/wallabag/tree/2.3.6) | 21 | ## [2.3.6](https://github.com/wallabag/wallabag/tree/2.3.6) |
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.5...2.3.6) | 22 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.5...2.3.6) |
| 5 | 23 | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 09b2f3a2..863c9345 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | wallabag_core: | 1 | wallabag_core: |
| 2 | version: 2.3.7-dev | 2 | version: 2.3.7 |
| 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
| 4 | languages: | 4 | languages: |
| 5 | en: 'English' | 5 | en: 'English' |