summaryrefslogtreecommitdiff
path: root/app/views/index/reader.phtml
AgeCommit message (Collapse)Author
2015-01-08Merge branch 'dev' into 252-extensionsGravatar Marien Fressinaud
Conflicts: app/FreshRSS.php app/Models/Configuration.php app/views/index/index.phtml app/views/index/normal.phtml lib/Minz/Configuration.php lib/Minz/Translate.php lib/lib_rss.php
2015-01-05Change name of user configuration var in ContextGravatar Marien Fressinaud
- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf - Introduce FreshRSS_Context::$system_conf - Remove FreshRSS_Configuration object See https://github.com/FreshRSS/FreshRSS/issues/730
2014-12-17Merge branch 'dev' into 252-extensionsGravatar Marien Fressinaud
Conflicts: app/i18n/en/admin.php app/i18n/en/feedback.php app/i18n/en/gen.php app/i18n/fr/admin.php app/i18n/fr/feedback.php app/i18n/fr/gen.php app/views/index/normal.phtml
2014-12-11Fix french i18n for auth and configure viewsGravatar Marien Fressinaud
2014-12-11Fix i18n for index ControllerGravatar Marien Fressinaud
Fix strings for: - about page - rss and reader views - fix title of global view
2014-12-07Add entry_before_display hookGravatar Marien Fressinaud
See https://github.com/FreshRSS/FreshRSS/issues/252
2014-10-24Reader view comes back!Gravatar Marien Fressinaud
See https://github.com/marienfressinaud/FreshRSS/issues/634