Marien Fressinaud a97bbd9bd5 Merge branch 'dev' ...

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

2015-01-31 14:45:37 +01:00

..

Controllers

Merge branch 'dev'

2015-01-31 14:45:37 +01:00

Exceptions

Fix a set of TODO and bugs

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

i18n

Fix german gen.js.request_failed

2015-01-27 20:46:36 +01:00

layout

! encoding problem 2

2015-01-22 08:31:54 +01:00

Models

Use url_remove_credentials to log URL

2015-01-29 10:57:11 +01:00

SQL

Add checking installation feature

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

views

Change behaviour of #add_rss input.extend

2015-01-29 09:52:43 +01:00

.htaccess

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

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

actualize_script.php

Remove calls to syslog()

2015-01-29 10:14:45 +01:00

FreshRSS.php

Fix coding style in extension manager

2015-01-14 23:40:18 +01:00

index.html

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

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

install.php

Give indication on password format

2015-01-26 10:47:09 +01:00