From 1d933dfe1303a34a7d23ba4721a5eaa9d2b641ce Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 8 Apr 2019 23:35:28 +0200 Subject: Start next version 1.14.3-dev --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 7759d7a56..dac6be8e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # FreshRSS changelog +## 2019-0X-XX FreshRSS 1.14.3-dev + + + ## 2019-04-08 FreshRSS 1.14.2 * Bug fixing (regressions introduced in 1.14.X) -- cgit v1.2.3 From 3a06d6d465814d7f56f36ca1771ac494730ec3a6 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 22 Jun 2019 14:35:37 +0200 Subject: Changelog + credits update --- CHANGELOG.md | 18 ++++++++++++++++++ CREDITS.md | 3 +++ 2 files changed, 21 insertions(+) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index dac6be8e8..40204ac95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ ## 2019-0X-XX FreshRSS 1.14.3-dev +* Security + * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) +* UI + * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) + * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) + * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) + * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) + * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) + * Updated to jQuery 3.4.1 [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) +* Bug fixing + * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) +* Deployment + * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) + * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) +* I18n + * Improve Occitan [#2358](https://github.com/FreshRSS/FreshRSS/pull/2358) +* Misc. + * New parameter `?maxFeeds=10` to control the max number of feeds to refresh manually [#2388](https://github.com/FreshRSS/FreshRSS/pull/2388) ## 2019-04-08 FreshRSS 1.14.2 diff --git a/CREDITS.md b/CREDITS.md index cc3cc57a4..c1dd4f502 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -7,6 +7,7 @@ People are sorted by name so please keep this order. --- * [Adrien Dorsaz](https://github.com/Trim): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Trim), [Web](https://adorsaz.ch/) +* [Alexander Steinhöfer](https://github.com/lx-s): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:lx-s), [Web](https://lx-s.de/) * [Alexandre Alapetite](https://github.com/Alkarex): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alkarex), [Web](https://alexandre.alapetite.fr/) * [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg) * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin) @@ -23,6 +24,7 @@ People are sorted by name so please keep this order. * [dswd](https://github.com/dswd): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:dswd) * [Django Janny](https://github.com/keltroth): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:keltroth) * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed) +* [Fake4d](https://github.com/Fake4d): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Fake4d) * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/) * [gsongsong](https://github.com/gsongsong): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong) * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/) @@ -60,6 +62,7 @@ People are sorted by name so please keep this order. * [Ramón Cutanda](https://github.com/rcutanda): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rcutanda) * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi) * [sirideain](https://github.com/sirideain): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=sirideain) +* [Sp3r4z](https://github.com/Sp3r4z): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Sp3r4z) * [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic) * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42) * [Thomas Citharel](https://github.com/tcitworld): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:tomgue), [Web](https://www.tcit.fr/) -- cgit v1.2.3 From c161d4965a1461f3894c2ecb86a6b0948ee04940 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 22 Jun 2019 14:41:06 +0200 Subject: Minor readme --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 40204ac95..332d7ba3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,15 @@ * Security * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) +* Bug fixing + * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) + * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) + * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) * UI * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) - * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) - * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) * Updated to jQuery 3.4.1 [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) -* Bug fixing - * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) * Deployment * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) -- cgit v1.2.3 From af8b39a20444b16365c144c10ae5e58d08857bc0 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 8 Jul 2019 13:10:51 +0200 Subject: Changelog, credits https://github.com/FreshRSS/FreshRSS/issues/2429 https://github.com/FreshRSS/FreshRSS/pull/2431 https://github.com/FreshRSS/FreshRSS/issues/2437 https://github.com/FreshRSS/FreshRSS/pull/2439 --- CHANGELOG.md | 4 ++++ CREDITS.md | 2 ++ Docker/README.md | 2 ++ 3 files changed, 8 insertions(+) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 332d7ba3e..f548bc86b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Security * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) * Bug fixing + * Fix wrong mark-as-read limit [#2429](https://github.com/FreshRSS/FreshRSS/issues/2429) * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) @@ -12,8 +13,11 @@ * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) + * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) * Updated to jQuery 3.4.1 [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Deployment + * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438) + * Docker: Add a version for ARM achitecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) * I18n diff --git a/CREDITS.md b/CREDITS.md index c1dd4f502..727fe64b6 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -61,6 +61,8 @@ People are sorted by name so please keep this order. * [Quentin Pagès](https://github.com/Quenty31): [contributions](https://github.com/FreshRSS/documentation/commits?author=Quenty31) * [Ramón Cutanda](https://github.com/rcutanda): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rcutanda) * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi) +* [Rosemary Le Faive](https://github.com/rosiel): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rosiel) +* [Sandro Jäckel](https://github.com/SuperSandro2000): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:SuperSandro2000), [Web](https://supersandro.de/) * [sirideain](https://github.com/sirideain): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=sirideain) * [Sp3r4z](https://github.com/Sp3r4z): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Sp3r4z) * [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic) diff --git a/Docker/README.md b/Docker/README.md index c2db38fb5..c93178ff7 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -75,6 +75,7 @@ sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ `--label traefik.frontend.rule='Host:freshrss.example.net;PathPrefixStrip:/FreshRSS/' \` * You may remove the `--label traefik.*` lines if you do not use Træfik. * Add `-p 8080:80 \` if you want to expose FreshRSS locally, e.g. on port `8080`. +* Replace `freshrss/freshrss` by a more specific tag (see below) such as `freshrss/freshrss:dev` for the development version, or `freshrss/freshrss:arm` for a Raspberry Pi version. This already works with a built-in **SQLite** database (easiest), but more powerful databases are supported: @@ -136,6 +137,7 @@ The tags correspond to FreshRSS branches and versions: * `:latest` (default) is the `master` branch, more stable * `:dev` is the `dev` branch, rolling release * `:x.y.z` are specific FreshRSS releases +* `:arm` or `:*-arm` are the ARM versions (e.g. for Raspberry Pi) ### Linux: Ubuntu vs. Alpine Our default image is based on [Ubuntu](https://www.ubuntu.com/server). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `*-alpine` tag suffix). -- cgit v1.2.3 From a394d7ab10dbaaca78cc8ca3c6536d7a808d7931 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 13 Jul 2019 15:19:39 +0200 Subject: Docker Hub readme (#2441) * Docker Hub readme Try to use anothe readme. And update info for https://alpinelinux.org/posts/Alpine-3.10.1-released.html * Test another variant * /tmp/ did not work --- CHANGELOG.md | 2 +- Docker/hooks/post_checkout | 4 ++++ Docker/hooks/pre_build | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 Docker/hooks/post_checkout (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index f548bc86b..4b734e22f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438) * Docker: Add a version for ARM achitecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) - * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) + * Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) * I18n * Improve Occitan [#2358](https://github.com/FreshRSS/FreshRSS/pull/2358) * Misc. diff --git a/Docker/hooks/post_checkout b/Docker/hooks/post_checkout new file mode 100644 index 000000000..b33c941e5 --- /dev/null +++ b/Docker/hooks/post_checkout @@ -0,0 +1,4 @@ +#!/bin/bash + +mv ../README.md ../README.en.md +mv README.md ../ diff --git a/Docker/hooks/pre_build b/Docker/hooks/pre_build index 32074059c..5946b045b 100755 --- a/Docker/hooks/pre_build +++ b/Docker/hooks/pre_build @@ -1,7 +1,5 @@ #!/bin/bash -cp README.md ../ - if [[ "$DOCKERFILE_PATH" == *-ARM ]] then # https://github.com/balena-io/qemu -- cgit v1.2.3 From 7197c76e099bab9a41fa357082261186ec9fdb10 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 21 Jul 2019 12:01:23 +0200 Subject: Changelog 2381, 2446 https://github.com/FreshRSS/FreshRSS/issues/2446 https://github.com/FreshRSS/FreshRSS/pull/2449 https://github.com/FreshRSS/FreshRSS/issues/2381 https://github.com/FreshRSS/FreshRSS/pull/2442 --- CHANGELOG.md | 11 +++++++---- CREDITS.md | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b734e22f..a29ea841c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,11 @@ ## 2019-0X-XX FreshRSS 1.14.3-dev -* Security - * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) * Bug fixing * Fix wrong mark-as-read limit [#2429](https://github.com/FreshRSS/FreshRSS/issues/2429) * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) + * Fix user self-registration [#2381](https://github.com/FreshRSS/FreshRSS/issues/2381) + * Make CGI Authorization configuration for API more compatible [#2446](https://github.com/FreshRSS/FreshRSS/issues/2446) * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) * UI @@ -14,16 +14,19 @@ * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) - * Updated to jQuery 3.4.1 [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) + * Updated to jQuery 3.4.1 (only for statistics page) [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Deployment * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438) - * Docker: Add a version for ARM achitecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) + * Docker: Add a version for ARM architecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) * Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) +* Security + * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) * I18n * Improve Occitan [#2358](https://github.com/FreshRSS/FreshRSS/pull/2358) * Misc. * New parameter `?maxFeeds=10` to control the max number of feeds to refresh manually [#2388](https://github.com/FreshRSS/FreshRSS/pull/2388) + * Default to SQLite during install [#2443](https://github.com/FreshRSS/FreshRSS/pull/2443) ## 2019-04-08 FreshRSS 1.14.2 diff --git a/CREDITS.md b/CREDITS.md index 727fe64b6..3c684dcab 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -45,6 +45,7 @@ People are sorted by name so please keep this order. * [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](https://marienfressinaud.fr/) * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/) * [MSZ](https://github.com/mszkb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mszkb) +* [Nick Cross](https://github.com/rnc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rnc) * [Nico B](https://github.com/youknow0): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:youknow0) * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie) * [Nicolas Frandeboeuf](https://github.com/nicofrand): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicofrand), [Web](https://nicofrand.ey) -- cgit v1.2.3 From 0a297addc060692f163c2614aa9989f5840f494a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 21 Jul 2019 12:49:29 +0200 Subject: Add php-gmp for API in Ubuntu 32-bit (#2450) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And adjust slightly the HEALTHCHECK parameters for faster start in Træfik --- CHANGELOG.md | 1 + Docker/Dockerfile | 4 ++-- Docker/Dockerfile-Alpine | 2 +- Docker/Dockerfile-QEMU-ARM | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index a29ea841c..ade2b2438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Make CGI Authorization configuration for API more compatible [#2446](https://github.com/FreshRSS/FreshRSS/issues/2446) * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) + * Docker: Add `php-gmp` for API support in Ubuntu 32-bit [#2450](https://github.com/FreshRSS/FreshRSS/pull/2450) * UI * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index eea2ea49c..1eac3687b 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && \ apt install --no-install-recommends -y \ ca-certificates cron curl \ apache2 libapache2-mod-php \ - php-curl php-intl php-mbstring php-xml php-zip \ + php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/* @@ -55,5 +55,5 @@ CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ exec apache2 -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 4078ad0cb..1715ff778 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -52,5 +52,5 @@ EXPOSE 80 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ exec httpd -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index fb136e34e..87a807350 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -13,7 +13,7 @@ RUN apt update && \ apt install --no-install-recommends -y \ ca-certificates cron curl \ apache2 libapache2-mod-php \ - php-curl php-intl php-mbstring php-xml php-zip \ + php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/* @@ -67,5 +67,5 @@ CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ exec apache2 -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 -- cgit v1.2.3 From 61af33a6f58e15d88a08765046bbaf08be7dd49e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 23 Jul 2019 10:01:52 +0200 Subject: Readme 2454-2456 https://github.com/FreshRSS/FreshRSS/pull/2454 https://github.com/FreshRSS/FreshRSS/pull/2455 https://github.com/FreshRSS/FreshRSS/pull/2456 +hadolint remove PIP warning --- .hadolint.yaml | 2 -- CHANGELOG.md | 4 +++- CREDITS.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'CHANGELOG.md') diff --git a/.hadolint.yaml b/.hadolint.yaml index 416099d45..5911deaf5 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,7 +1,5 @@ ignored: # ignore apt version pinning - DL3008 - # ignore pip version pinning - - DL3013 # ignore apk version pinning - DL3018 diff --git a/CHANGELOG.md b/CHANGELOG.md index ade2b2438..51cfa5acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,11 @@ * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) * Updated to jQuery 3.4.1 (only for statistics page) [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Deployment - * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438) + * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438), [#2455](https://github.com/FreshRSS/FreshRSS/pull/2455) * Docker: Add a version for ARM architecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) * Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) + * Add `hadolint` automatic check of Docker files in Travis [#2456](https://github.com/FreshRSS/FreshRSS/pull/2456) * Security * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) * I18n @@ -28,6 +29,7 @@ * Misc. * New parameter `?maxFeeds=10` to control the max number of feeds to refresh manually [#2388](https://github.com/FreshRSS/FreshRSS/pull/2388) * Default to SQLite during install [#2443](https://github.com/FreshRSS/FreshRSS/pull/2443) + * Add automatic check of shell scripts in Travis with `shellcheck` and `shfmt` [#2454](https://github.com/FreshRSS/FreshRSS/pull/2454) ## 2019-04-08 FreshRSS 1.14.2 diff --git a/CREDITS.md b/CREDITS.md index 15ab5417a..81d647b84 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -38,6 +38,7 @@ People are sorted by name so please keep this order. * [Jonas Östanbäck](https://github.com/cez81): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=cez81) * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/) * [Kevin Papst](https://github.com/kevinpapst): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kevinpapst), [Web](http://www.kevinpapst.de/) +* [Leepic](https://github.com/Leepic): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Leepic) * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry), [Web](https://www.fiat-tux.fr/) * [Luc Sanchez](https://github.com/ColonelMoutarde): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ColonelMoutarde), (https://www.luc-sanchez.fr/) * [marcomrc](https://github.com/marcomrc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marcomrc) -- cgit v1.2.3 From 042b40eeeea77db854daab1bec96fce5c2cdd4b2 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 25 Jul 2019 16:01:00 +0200 Subject: Release FreshRSS 1.14.3 --- CHANGELOG.md | 14 +++++++------- constants.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 51cfa5acc..f33712f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # FreshRSS changelog -## 2019-0X-XX FreshRSS 1.14.3-dev +## 2019-07-25 FreshRSS 1.14.3 +* UI + * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) + * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) + * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) + * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) + * Updated to jQuery 3.4.1 (only for statistics page) [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Bug fixing * Fix wrong mark-as-read limit [#2429](https://github.com/FreshRSS/FreshRSS/issues/2429) * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) @@ -10,12 +16,6 @@ * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) * Docker: Add `php-gmp` for API support in Ubuntu 32-bit [#2450](https://github.com/FreshRSS/FreshRSS/pull/2450) -* UI - * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) - * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) - * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) - * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) - * Updated to jQuery 3.4.1 (only for statistics page) [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Deployment * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438), [#2455](https://github.com/FreshRSS/FreshRSS/pull/2455) * Docker: Add a version for ARM architecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) diff --git a/constants.php b/constants.php index 2ecbf16fe..2a31f71d5 100644 --- a/constants.php +++ b/constants.php @@ -2,7 +2,7 @@ //NB: Do not edit; use ./constants.local.php instead. // -define('FRESHRSS_VERSION', '1.14.3-dev'); +define('FRESHRSS_VERSION', '1.14.3'); define('FRESHRSS_WEBSITE', 'https://freshrss.org'); define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/'); -- cgit v1.2.3