Marien Fressinaud
73023bc12b
Merge branch 'dev' into 252-extensions
...
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-08 14:18:32 +01:00
Marien Fressinaud
7cca47d1ab
Change name of user configuration var in Context
...
- 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
2015-01-05 22:45:03 +01:00
Marien Fressinaud
0b89867800
Merge branch 'dev' into 252-extensions
...
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-17 21:41:33 +01:00
Marien Fressinaud
a84e9e50bf
Fix french i18n for auth and configure views
2014-12-11 21:15:01 +01:00
Marien Fressinaud
57bffe83eb
Fix i18n for index Controller
...
Fix strings for:
- about page
- rss and reader views
- fix title of global view
2014-12-11 00:25:02 +01:00
Marien Fressinaud
5932c3427b
Add entry_before_display hook
...
See https://github.com/FreshRSS/FreshRSS/issues/252
2014-12-07 14:31:50 +01:00
Marien Fressinaud
0d6993fe08
Reader view comes back!
...
See https://github.com/marienfressinaud/FreshRSS/issues/634
2014-10-24 12:51:17 +02:00
