Commit Graph

513 Commits

Author SHA1 Message Date
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Frédéric FRANCE
ba9d2c3690 Update card.php 2014-10-23 11:02:16 +02:00
Frédéric FRANCE
5e946d6466 Update card.php 2014-10-18 22:49:07 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Frédéric FRANCE
446e73d8b8 Update card.php 2014-10-18 18:49:47 +02:00
Frédéric FRANCE
b80b45c086 Update card.php 2014-10-18 15:55:10 +02:00
Frédéric FRANCE
98db599c69 Update card.php 2014-10-18 15:51:05 +02:00
Frédéric FRANCE
99dde1ad1e Update card.php 2014-10-12 20:44:50 +02:00
Frédéric FRANCE
633f01e5a2 Update card.php 2014-10-12 14:26:51 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00