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

..

auth

Fix last calls to Minz_Configuration methods

2015-01-06 20:50:58 +01:00

configure

Refactor FreshRSS_Share object to be more usable

2015-01-07 14:59:18 +01:00

entry

Coding style (views)

2014-10-05 19:11:43 +02:00

error

Fix french i18n for last views

2014-12-11 21:44:25 +01:00

extension

Fix i18n for extension system

2014-12-17 21:44:00 +01:00

feed

Fix french i18n for last views

2014-12-11 21:44:25 +01:00

helpers

Merge branch 'dev' into 252-extensions

2015-01-08 14:18:32 +01:00

importExport

Fix i18n for import/export

2014-12-11 17:46:05 +01:00

index

Merge branch 'dev' into 252-extensions

2015-01-08 14:18:32 +01:00

javascript

Fix french i18n for last views

2014-12-11 21:44:25 +01:00

stats

Coding style endforeach (must be avoided)

2014-12-17 21:15:24 +01:00

subscription

Fix french i18n for install + some fixes

2014-12-11 22:40:07 +01:00

update

Fix french i18n for last views

2014-12-11 21:44:25 +01:00

user

Fix i18n loading and availableLanguages calls

2015-01-06 21:10:51 +01:00