Laurent Destailleur 5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php

2014-11-05 16:37:07 +01:00

..

doctemplates

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

lib

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

mssql

Merge remote-tracking branch 'origin/3.6' into develop

2014-11-05 16:37:07 +01:00

mysql

Maj doc

2014-11-05 11:01:53 +01:00

pgsql

Fix: table name differs.

2014-10-14 01:47:31 +02:00

check.php

Look: Refresh install style with more neutral colors. Select line style

2014-08-03 11:18:32 +02:00

default.css

Style for install match css of login.

2014-10-09 13:47:40 +02:00

etape1.php

Style for install match css of login.

2014-10-09 13:47:40 +02:00

etape2.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

etape4.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

etape5.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

fileconf.php

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00

inc.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

phpinfo.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

repair.php

Fix: Pb into repair function

2014-09-24 00:51:36 +02:00

robots.txt

…

upgrade2.php

Work on multi user for events.

2014-09-23 16:15:15 +02:00

upgrade.php

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00