124 Commits

Author SHA1 Message Date
Marion Muszynski
b763543244 adding ant_alert module 2016-03-29 17:01:26 +02:00
Marion Muszynski
26701eeba5 fix conflict 2016-03-23 12:02:14 +01:00
Marion Muszynski
67264249a5 fix quantity and product with attribute 2016-03-23 11:49:34 +01:00
Alexandre Simonet
9240003ba5 Fix 2016-03-21 10:07:35 +01:00
Marion Muszynski
9a3da1848d Merge branch 'ticket-9642' into develop 2016-03-18 15:57:48 +01:00
Marion Muszynski
6feaf9ff28 test carrier cost 2016-03-18 15:57:22 +01:00
Marion Muszynski
3cca940e40 Merge branch 'ticket-9642' into develop 2016-03-17 12:32:16 +01:00
Marion Muszynski
879418dea1 add check carrier in ParentOrderController 2016-03-17 12:31:42 +01:00
Marion Muszynski
3e64a14e8b Merge branch 'ticket-9642' into develop 2016-03-16 15:25:16 +01:00
Marion Muszynski
e152929f34 trim email update 2016-03-11 01:00:52 +01:00
Marion Muszynski
a9b942ecf6 trim email 2016-03-10 18:19:41 +01:00
Thibault UBUNTU
fad3dbe3c5 fix merge master 2016-03-10 10:40:06 +01:00
Srv Bebeboutik
1426efaff2 change gitignore + class product 2016-03-09 16:33:05 +01:00
Thibault UBUNTU
5ee28563f1 block canaries delivery 2016-03-07 15:58:26 +01:00
Marion Muszynski
5bb7d037a9 fix conflit FrontController 2016-02-24 17:39:59 +01:00
Marion Muszynski
bd3c6cb40c merge frontController/config.inc 2016-02-24 17:23:16 +01:00
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Srv Bebeboutik
fc61e2ed3a fix truc de merdeeeeeeeeeeee 2016-02-24 16:11:24 +01:00
Thibault UBUNTU
4d81184816 fix conflict 2016-02-24 16:03:29 +01:00
Thibault UBUNTU
d39e27d271 fix conflit 2016-02-24 16:02:43 +01:00
Alexandre Simonet
f778675389 sav 2016-02-23 17:33:08 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
bfcb4e9aa6 add override class cart to display flag 2016-01-27 16:00:05 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00