198 Commits

Author SHA1 Message Date
Preprod mutu
a750816751 solve conflict 2017-09-07 11:29:33 +02:00
Preprod mutu
e7d1a8a27c tnt 2017-09-07 11:10:07 +02:00
Nolwenn
178518a772 recette 2 2017-09-07 11:08:38 +02:00
Nolwenn
420f640de5 tnt 2017-09-06 09:43:41 +02:00
Preprod mutu
81e3e747d9 conflit simulator.css 2017-09-04 16:19:30 +02:00
Preprod mutu
7419df5014 recette inté 2017-09-04 16:18:00 +02:00
Michael RICOIS
0694d7f718 Test size in double cube 2017-09-04 16:05:30 +02:00
Michael RICOIS
36f38fc059 Image DoubleCube bicolor 2017-09-04 12:59:02 +02:00
Michael RICOIS
4f12e7c643 Autoriser les fichiers jpeg 2017-09-04 12:29:00 +02:00
Michael RICOIS
2229518409 Uninstall 2017-09-01 15:47:48 +02:00
Michael RICOIS
916729deb2 Fix simulator doublecube-bicolor 2017-08-31 12:33:16 +02:00
Nolwenn
7cb3ea3014 recette 2017-08-30 17:25:30 +02:00
Michael RICOIS
83dab90ffe Remove module tntcarrier 2017-08-30 11:38:14 +02:00
Michael RICOIS
e1a2bf1f18 Module Tnt Officiel 2017-08-30 11:37:48 +02:00
Nolwenn
d5829964f3 suite recette 2017-08-30 10:41:20 +02:00
Michael RICOIS
b3104d1690 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-29 15:34:21 +02:00
Michael RICOIS
f0135c1781 Fix ajax price 2017-08-29 15:34:10 +02:00
Nolwenn
43c982dff8 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-29 15:25:33 +02:00
Nolwenn
cb3674d030 recette graphique 2017-08-29 15:25:15 +02:00
Michael RICOIS
6981a8b01e Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-29 15:16:41 +02:00
Michael RICOIS
cb2ce395a0 Price with flatrate 2017-08-29 15:16:24 +02:00
Nolwenn
52e1ee9ded Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-29 10:46:37 +02:00
Nolwenn
936adcc6c3 recette + ekomi 2017-08-29 10:46:12 +02:00
Michael RICOIS
84682fc048 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-28 17:32:24 +02:00
Michael RICOIS
fec7604a43 Add module atos 2017-08-28 17:32:14 +02:00
Michael RICOIS
a54e773efd Add module tntcarrier 2017-08-28 17:20:27 +02:00
Preprod mutu
6c269bd0c7 fix form checkbox 2017-08-24 18:17:43 +02:00
Michael RICOIS
9d19197de8 Try to have default_pagination to 300 2017-08-24 18:01:45 +02:00
Preprod mutu
4017e74863 form simulator bicolor 2017-08-24 16:39:00 +02:00
Michael RICOIS
b6a84e1190 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-24 16:04:05 +02:00
Preprod mutu
29cc17504f formulaires fiche configirateurs 2017-08-24 16:02:55 +02:00
Preprod mutu
1da283285a form vrac exclu + form sachet exclu 2017-08-24 12:56:04 +02:00
Preprod mutu
4c57b48b7d simulator 2017-08-24 12:40:55 +02:00
Michael RICOIS
9ef4fafd58 Remove key_tab (don't load entire page) 2017-08-24 12:16:42 +02:00
Michael RICOIS
e2a454bf78 Fix chocos select 2017-08-24 12:09:32 +02:00
Michael RICOIS
c046ab121c Fix chocos select 2017-08-24 12:09:18 +02:00
Michael RICOIS
a0161edbcb Remove console.log 2017-08-24 12:08:52 +02:00
Preprod mutu
5896becac2 :q
Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage
2017-08-24 11:05:34 +02:00
Preprod mutu
473bbb2b95 modif instagram + antadisconfigurator + antadis smulator 2017-08-24 11:05:17 +02:00
Michael RICOIS
7e68e8b70f Change ORDER BY 2017-08-24 10:27:54 +02:00
Nolwenn
8fcca0ba8b Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-23 18:19:17 +02:00
Nolwenn
88cedb9bdc tunnel + FP 2017-08-23 18:19:01 +02:00
Michael RICOIS
69fff294f7 Add orderby 2017-08-23 15:44:27 +02:00
Michael RICOIS
eb92dee9f2 Fix name 2017-08-23 14:47:11 +02:00
Nolwenn
de1e18230e responsive 2017-08-23 12:18:30 +02:00
Nolwenn
26da659055 fiche produit libelles 2017-08-22 17:33:26 +02:00
Michael RICOIS
ee8f23aaef sachet et vrac exclusif 2017-08-18 15:37:04 +02:00
Michael RICOIS
ba9e2ce8b2 Fix select color 2017-08-18 12:47:39 +02:00
Michael RICOIS
5cf939fdcb Typo 2017-08-18 11:18:07 +02:00
Michael RICOIS
1763fbee30 Exclusif 2017-08-17 17:34:14 +02:00