Commit Graph

7 Commits

Author SHA1 Message Date
Alexandre Alapetite
d073331d24 Tag link double encoding problem
https://github.com/FreshRSS/FreshRSS/issues/970
Tags coming from the database are already HTML-encoded.
2015-09-08 21:31:24 +02:00
Alexandre Alapetite
9fcdaf99e2 Error encoding tag link
https://github.com/FreshRSS/FreshRSS/issues/970
2015-09-08 20:52:37 +02:00
Marien Fressinaud
03db0b5d3c Fix a bug related to sharing
$item and $feed were not existing, replaced by other names.
Introduce by the merging of dev in extension branch.
2015-01-08 21:37:59 +01:00
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
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
930026df21 Fix bug with new file organisation
entry_bottom.phtml didn't find $feed variable. It's fixed now.
2014-12-17 21:25:20 +01:00
Marien Fressinaud
ea849d7c68 Prepare better organization of view files for exts
View files must be well-splitted to simplify work for extensions.

See https://github.com/FreshRSS/FreshRSS/issues/252
2014-12-07 15:03:42 +01:00