diff --git a/README.md b/README.md index 4f28f18..fae8f77 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. -**Shipped version:** 20191209 +**Shipped version:** 2020.06.18 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 02b8322..db9f2bd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/insta Tiny-Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS / Atom) en ligne gratuit et open source. -**Version incluse :** 20191209 +**Version incluse :** 2020.06.18 ## Captures d’écran @@ -63,6 +63,6 @@ Merci de faire vos pull request sur la [testing branch](https://github.com/YunoH Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug ``` diff --git a/conf/app.src b/conf/app.src index 1b8b357..06d6452 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/44ef447c0f3c4cd5d5bbd02b2971ea80422a8439.tar.gz -SOURCE_SUM=13e75d7419fbc0a96d73fcd09755f91a3d8c90fb6a85992f8b2e6f80f433d434 +SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/6eb94f1e1397ae97ed9a0e78d0edc2d04b0915a6.tar.gz +SOURCE_SUM=01f7d9acd9e6e5b67c7b9142e165a60b81a767962c3deaa7eafac46002c5608e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 41ecbbb..3d0089a 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "ttrss", "packaging_format": 1, "description": { - "en": "A PHP and Ajax feed reader", - "fr": "Un lecteur de flux en PHP et Ajax" + "en": "A RSS feed reader", + "fr": "Un lecteur de flux RSS" }, - "version": "20191209~ynh1", + "version": "20200618~ynh1", "url": "http://tt-rss.org", "license": "GPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 6cf0ba5..e80a946 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -2,7 +2,7 @@ - *Description of why you made this PR* ## Solution -- *And how you fix that* +- *And how do you fix that problem* ## PR Status - [ ] Code finished. @@ -11,14 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/ttrss_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/ttrss_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/ttrss_ynh_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/ttrss_ynh_ynh%20PR-NUM-%20(USERNAME)/)