diff --git a/scripts/upgrade b/scripts/upgrade index 9a26e2b..1cf2f95 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,5 @@ #!/bin/bash - #backup data folder final_path=/var/www/freshrss sudo cp -a $final_path/data /tmp/freshrss-data.bak diff --git a/sources/CHANGELOG b/sources/CHANGELOG index 44d3452..1a4a887 100755 --- a/sources/CHANGELOG +++ b/sources/CHANGELOG @@ -1,5 +1,20 @@ # Journal des modifications +## 2014-10-09 FreshRSS 0.8.1 / 0.9.1 (beta) + +* UI + * Add a space after tag icon +* Statistics + * Add an average per day on the 30 day period graph + * Add percent of total on top 10 feed +* Bug fixes + * Fix "mark as read" in global view + * Fix "read all" shortcut + * Fix categories not appearing when adding a new feed (GET action) + * Fix enclosure problem + * Fix getExtension() on PHP < 5.3.7 + + ## 2014-09-26 FreshRSS 0.8.0 / 0.9.0 (beta) * UI diff --git a/sources/README.fr.md b/sources/README.fr.md index 46f1e7c..2bc8872 100755 --- a/sources/README.fr.md +++ b/sources/README.fr.md @@ -10,8 +10,8 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an * Site officiel : http://freshrss.org * Démo : http://demo.freshrss.org/ * Développeur : Marien Fressinaud -* Version actuelle : 0.8.0 -* Date de publication 2014-09-26 +* Version actuelle : 0.8.1 +* Date de publication : 2014-10-09 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png) diff --git a/sources/README.md b/sources/README.md index 501dca3..77fa9f9 100755 --- a/sources/README.md +++ b/sources/README.md @@ -10,8 +10,8 @@ It is a multi-user application with an anonymous reading mode. * Official website: http://freshrss.org * Demo: http://demo.freshrss.org/ * Developer: Marien Fressinaud -* Current version: 0.8.0 -* Publication date: 2014-09-26 +* Current version: 0.8.1 +* Publication date: 2014-10-09 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png) diff --git a/sources/app/Controllers/feedController.php b/sources/app/Controllers/feedController.php index c7cc25f..f75c969 100755 --- a/sources/app/Controllers/feedController.php +++ b/sources/app/Controllers/feedController.php @@ -171,7 +171,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { // GET request so we must ask confirmation to user Minz_View::prependTitle(Minz_Translate::t('add_rss_feed') . ' · '); - $this->view->categories = $this->catDAO->listCategories(); + $this->view->categories = $this->catDAO->listCategories(false); $this->view->feed = new FreshRSS_Feed($url); try { // We try to get some more information about the feed diff --git a/sources/app/Controllers/indexController.php b/sources/app/Controllers/indexController.php index e8e26b1..d3b299f 100755 --- a/sources/app/Controllers/indexController.php +++ b/sources/app/Controllers/indexController.php @@ -330,7 +330,8 @@ class FreshRSS_index_Controller extends Minz_ActionController { private static function purgeTokens() { $oldest = time() - 2629744; //1 month //TODO: Use a configuration instead foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $fileInfo) { - if ($fileInfo->getExtension() === 'txt' && $fileInfo->getMTime() < $oldest) { + $extension = pathinfo($fileInfo->getFilename(), PATHINFO_EXTENSION); + if ($extension === 'txt' && $fileInfo->getMTime() < $oldest) { @unlink($fileInfo->getPathname()); } } diff --git a/sources/app/Controllers/statsController.php b/sources/app/Controllers/statsController.php index 256543f..3069be3 100755 --- a/sources/app/Controllers/statsController.php +++ b/sources/app/Controllers/statsController.php @@ -21,6 +21,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController { Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js'))); $this->view->repartition = $statsDAO->calculateEntryRepartition(); $this->view->count = $statsDAO->calculateEntryCount(); + $this->view->average = $statsDAO->calculateEntryAverage(); $this->view->feedByCategory = $statsDAO->calculateFeedByCategory(); $this->view->entryByCategory = $statsDAO->calculateEntryByCategory(); $this->view->topFeed = $statsDAO->calculateTopFeed(); diff --git a/sources/app/Models/Feed.php b/sources/app/Models/Feed.php index 2a5ea45..03baf3a 100755 --- a/sources/app/Models/Feed.php +++ b/sources/app/Models/Feed.php @@ -288,6 +288,8 @@ class FreshRSS_Feed extends Minz_Model { $content .= '