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

..

authController.php

Fix a call to $system_conf

2015-01-06 22:15:51 +01:00

categoryController.php

Fix calls to remove_query_by_get()

2015-01-07 15:37:24 +01:00

configureController.php

Fix setters on $user_conf

2015-01-06 21:54:46 +01:00

entryController.php

Change name of user configuration var in Context

2015-01-05 22:45:03 +01:00

errorController.php

Fix i18n for conf, entry, error, feed Controllers

2014-12-11 19:02:05 +01:00

extensionController.php

Merge branch 'dev' into 252-extensions

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

feedController.php

Merge branch 'dev' into 252-extensions

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

importExportController.php

Merge branch 'dev' into 252-extensions

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

indexController.php

BREAKING FEATURE: Remove general in config

2015-01-06 18:53:36 +01:00

javascriptController.php

Fix calls to FreshRSS_Configuration

2015-01-06 21:40:19 +01:00

statsController.php

Update i18n for statistics

2014-12-11 16:10:39 +01:00

subscriptionController.php

Fix i18n for conf, entry, error, feed Controllers

2014-12-11 19:02:05 +01:00

updateController.php

Fix i18n for update and user controllers

2014-12-11 19:32:59 +01:00

userController.php

Fix a call to availableLanguages() (bad object)

2015-01-06 22:14:14 +01:00