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

..

authController.php

Fix i18n for conf, entry, error, feed Controllers

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

categoryController.php

Fix i18n for auth and category controllers

2014-12-11 18:15:41 +01:00

configureController.php

Fix i18n for conf, entry, error, feed Controllers

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

entryController.php

Fix i18n strings for sharing

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

errorController.php

Fix i18n for conf, entry, error, feed Controllers

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

extensionController.php

Implement extension deletion

2014-12-08 13:36:08 +01:00

feedController.php

Merge branch 'dev' into 252-extensions

2014-12-17 21:41:33 +01:00

importExportController.php

Merge branch 'dev' into 252-extensions

2014-12-17 21:41:33 +01:00

indexController.php

Fix i18n for index Controller

2014-12-11 00:25:02 +01:00

javascriptController.php

Better log in case of nonce errors

2014-11-12 22:58:33 +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 i18n for update and user controllers

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