Laurent Destailleur 01aad8516d Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php

2015-05-31 03:30:38 +02:00

..

action

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

2015-05-31 03:30:38 +02:00

admin

Change generic and setup image title

2015-04-18 23:13:48 +02:00

askpricesupplier

NEW Show photo of logged user into login top right block.

2015-05-30 19:50:07 +02:00

mailing

Working on finishing of look

2015-05-22 15:29:19 +02:00

propal

Working on finishing of look

2015-05-22 14:28:02 +02:00

prospect

Include Categories class whenever Categorie::TYPE is used

2015-05-23 23:35:49 +02:00

address.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

card.php

Merge pull request #2673 from aternatik/fix_getentity

2015-05-07 00:48:19 +02:00

contact.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

index.php

Merge pull request #2673 from aternatik/fix_getentity

2015-05-07 00:48:19 +02:00

list.php

Add picto for commercial pages titles

2015-04-18 23:17:44 +02:00

multiprix.php

Removed closing php tag

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

propal.php

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

2015-05-31 03:30:38 +02:00

recap-client.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

remise.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

remx.php

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

2015-02-19 00:01:26 +01:00