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

..

Auth.php

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

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

Category.php

Coding style

2014-10-05 18:51:08 +02:00

CategoryDAO.php

Fix french i18n for install + some fixes

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

Configuration.php

Add enable / disable extension features

2014-12-06 16:17:11 +01:00

Context.php

Fix i18n for normal view

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

DatabaseDAO.php

Add checking installation feature

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

DatabaseDAOSQLite.php

Add checking installation feature

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

Days.php

Problème de casse renommage répertoire

2013-12-15 11:24:14 +01:00

Entry.php

Remove STATE_STRICT

2014-10-22 18:33:46 +02:00

EntryDAO.php

Add comments

2014-12-06 10:27:45 -05:00

EntryDAOSQLite.php

Add comments

2014-12-06 10:27:45 -05:00

Factory.php

Add checking installation feature

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

Feed.php

force_feed option

2014-11-12 23:28:47 +01:00

FeedDAO.php

Fix limit in import Json files

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

FeedDAOSQLite.php

Replace Minz_Log::record by corresponding methods

2014-10-05 19:35:29 +02:00

Log.php

Coding style

2014-10-05 18:51:08 +02:00

LogDAO.php

Coding style

2014-10-05 18:51:08 +02:00

Share.php

Sharing optimization

2014-03-08 09:18:06 -05:00

StatsDAO.php

Update i18n for statistics

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

StatsDAOSQLite.php

Add an average per day for the 30 day period

2014-09-29 18:54:03 -04:00

Themes.php

Reorganize subscription management code

2014-10-01 11:27:41 +02:00

UserDAO.php

Fix french i18n for install + some fixes

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