252 Commits

Author SHA1 Message Date
Thibault UBUNTU
463c3bbd93 fix conflit 2016-07-13 09:51:51 +02:00
Nolwenn
dd273586bb homemag suite 2016-07-07 17:00:49 +02:00
ToutPratique
8851a4b44f Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-07-06 12:25:45 +02:00
ToutPratique
3cbd9fad08 push prod 2016-07-06 12:25:40 +02:00
Thibault UBUNTU
cb25758a2d Merge branch 'reassurance' 2016-07-06 12:00:52 +02:00
Nolwenn
61580c0411 fix product reassurance suite 2016-07-04 13:34:58 +02:00
Nolwenn
4382efb269 fix reassurance product 2016-07-04 13:33:00 +02:00
Thibault UBUNTU
d36eea470c push gitignore 2016-07-01 14:39:37 +02:00
Thibault UBUNTU
900e7efa2b Merge branch 'product' 2016-07-01 13:00:12 +02:00
Nolwenn
fca3c47d0f fix offset line total shipping 2016-07-01 12:53:33 +02:00
Nolwenn
53e3dcdb96 fix reassurance page produit 2016-07-01 12:12:27 +02:00
Thibault UBUNTU
b77eb6d497 Merge branch 'product' 2016-07-01 10:59:31 +02:00
Nolwenn
e2abecf179 fix 2xold price* 2016-07-01 10:42:36 +02:00
Thibault UBUNTU
748edf68cf Merge branch 'lightbox' 2016-07-01 10:22:29 +02:00
Thibault UBUNTU
22e5b24c72 fix conflit 2016-07-01 10:22:24 +02:00
ToutPratique
2ddb6f75b6 push prod 2016-07-01 10:13:25 +02:00
ToutPratique
2e3e4f1e04 hotfix css 2016-06-23 12:33:14 +02:00
Thibault UBUNTU
9b8543841f fix conflict 2016-06-23 12:24:35 +02:00
ToutPratique
27d5228ae2 fix 2016-06-23 12:16:22 +02:00
ToutPratique
ca59f9d3de Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-06-23 11:44:40 +02:00
Thibault UBUNTU
2440ed6fd2 Merge branch 'menu' 2016-06-23 11:31:32 +02:00
Romuald
313890065f fix ajax menu event 2016-06-23 11:17:27 +02:00
ToutPratique
731a03a487 push prod 2016-06-23 10:23:03 +02:00
Nolwenn
2b02823a2c home mag 2016-06-22 16:12:58 +02:00
Nolwenn
d0951fd315 fix manufacturer 2016-06-15 10:44:40 +02:00
Nolwenn
eada1ce38d menu ios 2016-06-14 14:49:17 +02:00
Nolwenn
c4ef51a7ef header 2016-06-14 14:28:52 +02:00
Nolwenn
4412e657b8 promo menu 2016-06-14 13:10:03 +02:00
Nolwenn
23151dc501 product fix pictos 2016-06-14 12:17:26 +02:00
Nolwenn
f12869e4d5 fix conflict 2016-06-14 11:32:45 +02:00
Nolwenn
30b56b0956 header 2016-06-14 11:30:08 +02:00
Romuald
7703db4bf1 last child menu 2016-06-10 17:35:39 +02:00
Nolwenn
30fbc7b514 fix bloc manufacturer 2016-06-10 17:27:32 +02:00
Nolwenn
becde87c83 reajust print 2016-06-10 14:29:30 +02:00
Nolwenn
9f6cd0a602 product 2016-06-10 13:33:15 +02:00
Nolwenn
5ce2f20025 shopping cart 2016-06-10 13:09:02 +02:00
Romuald
71c94a2fca fix menu tab 2016-06-10 12:58:31 +02:00
Nolwenn
88e933931a typo 2016-06-10 12:01:26 +02:00
Nolwenn
54031b7931 fix header 2 2016-06-10 11:40:03 +02:00
Nolwenn
e90a470b76 fix header 2016-06-10 11:38:23 +02:00
Romuald
51c84be1d3 passage sur 3 colonnes 2016-06-10 10:33:34 +02:00
Nolwenn
1c879610e5 bloc manufacturer 2016-06-10 10:32:22 +02:00
Nolwenn
4ddae669f3 panier 2016-06-09 18:31:09 +02:00
Nolwenn
f596b9fa15 remove old reassurance 2016-06-09 16:01:17 +02:00
Nolwenn
41bd32f393 logo 2016-06-09 10:14:56 +02:00
Nolwenn
af3cb4737b lightbox 2016-06-09 10:10:21 +02:00
Nolwenn
1b1830932d header 2016-06-09 09:55:38 +02:00
Nolwenn
2599cb5eeb block manufacturer 2016-06-08 17:36:29 +02:00
Nolwenn
5a27c87b0e reassurance 2016-06-08 17:11:44 +02:00
Romuald
644588c281 fix js desktop 2016-06-02 12:53:12 +02:00