diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-12-14 22:53:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-14 22:53:07 +0100 |
commit | 45e26a7fc82c81e768a6f0f3c5955cfc6d42ebc5 (patch) | |
tree | 6d7ac83dd9a8d2b12f187fc45b58b76ddd148623 | |
parent | 4840d618c2b5464b9c04a0f693a68bc300bc099d (diff) | |
parent | a1272ab84da3ea67a3f621885e88068ac8718f47 (diff) | |
download | wallabag-45e26a7fc82c81e768a6f0f3c5955cfc6d42ebc5.tar.gz wallabag-45e26a7fc82c81e768a6f0f3c5955cfc6d42ebc5.tar.zst wallabag-45e26a7fc82c81e768a6f0f3c5955cfc6d42ebc5.zip |
Merge pull request #3812 from wallabag/prepare-2.3.5
Prepare 2.3.5 release
-rw-r--r-- | CHANGELOG.md | 13 | ||||
-rw-r--r-- | RELEASE_PROCESS.md | 11 | ||||
-rw-r--r-- | app/config/wallabag.yml | 2 |
3 files changed, 21 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index eb2c3084..52988f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,5 +1,18 @@ | |||
1 | # Changelog | 1 | # Changelog |
2 | 2 | ||
3 | ## [2.3.5](https://github.com/wallabag/wallabag/tree/2.3.5) | ||
4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.4...2.3.5) | ||
5 | |||
6 | ### Fixes | ||
7 | |||
8 | - Jump to 2.3.5-dev and update release process [#3778](https://github.com/wallabag/wallabag/pull/3778) | ||
9 | - Remove preview picture from single entry view page [#3765](https://github.com/wallabag/wallabag/pull/3765) | ||
10 | - Fix Android app login issue [#3784](https://github.com/wallabag/wallabag/pull/3784) | ||
11 | - material: fix missing thumbnail on list view [#3782](https://github.com/wallabag/wallabag/pull/3782) | ||
12 | - material: decrease size of tags on list view [#3783](https://github.com/wallabag/wallabag/pull/3783) | ||
13 | - build: upgrade yarn dependencies, update prod assets [#3781](https://github.com/wallabag/wallabag/pull/3781) | ||
14 | - No more dev for guzzle-site-authenticator [#3810](https://github.com/wallabag/wallabag/pull/3810) | ||
15 | |||
3 | ## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4) | 16 | ## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4) |
4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4) | 17 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4) |
5 | 18 | ||
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 7e43d9d6..8995580b 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md | |||
@@ -6,12 +6,15 @@ A release is mostly a git tag of http://github.com/wallabag/wallabag, following | |||
6 | 6 | ||
7 | During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4). | 7 | During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4). |
8 | 8 | ||
9 | #### Files to edit | 9 | #### Prepare the release |
10 | 10 | ||
11 | - `app/config/wallabag.yml` (`wallabag_core.version`) | 11 | - Update these files with new information |
12 | - `CHANGELOG.md` | 12 | - `app/config/wallabag.yml` (`wallabag_core.version`) |
13 | - `CHANGELOG.md` | ||
14 | - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release". | ||
15 | - Wait for test to be ok, merge it. | ||
13 | 16 | ||
14 | #### Create release on GitHub | 17 | #### Create a new release on GitHub |
15 | 18 | ||
16 | - Run these commands to create the tag: | 19 | - Run these commands to create the tag: |
17 | 20 | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 847a8058..1948175c 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.5-dev | 2 | version: 2.3.5 |
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' |