Marien Fressinaud 54479a5027 Merge branch 'dev' into beta ...

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

2014-10-31 16:57:11 +01:00

..

Controllers

Fix Minz_Error::error() -> use default values

2014-10-30 19:57:08 +01:00

Exceptions

Fix a set of TODO and bugs

2014-10-22 17:57:22 +02:00

i18n

Merge branch 'dev' into beta

2014-10-31 16:57:11 +01:00

layout

Update i18n

2014-10-26 12:22:13 +01:00

Models

Fix limit in import Json files

2014-10-29 11:47:51 +01:00

SQL

Add checking installation feature

2014-10-20 11:54:31 +02:00

views

Fix global view mark as read

2014-10-31 16:43:05 +01:00

.htaccess

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

actualize_script.php

Ne pas rafraîchir les flux des utilisateurs non logués depuis x jours

2014-10-29 00:45:42 +01:00

FreshRSS.php

Move back i18n init in FreshRSS.php

2014-10-22 18:06:28 +02:00

index.html

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

install.php

Update i18n with strings from i18n.freshrss.org

2014-10-06 14:23:17 +02:00