126 Commits

Author SHA1 Message Date
Michael RICOIS
808a2dfa6f Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-09-05 16:35:21 +02:00
Michael RICOIS
045de93764 Mail template for bat 2017-09-05 16:35:01 +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
05aedefdd6 Recette prix 2017-09-04 15:27:27 +02:00
Michael RICOIS
64cbcb3d8f Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-31 11:51:17 +02:00
Michael RICOIS
2bd1a5132d Maj des images 2017-08-31 11:51:02 +02:00
Nolwenn
8fb8e4c543 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-31 11:14:50 +02:00
Nolwenn
b97e67ebab recette 2017-08-31 11:11:33 +02:00
Preprod mutu
077d338b92 recette 2017-08-31 11:09:05 +02:00
Preprod mutu
f349c3298f Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 17:26:00 +02:00
Nolwenn
7cb3ea3014 recette 2017-08-30 17:25:30 +02:00
Preprod mutu
df4ab144ba Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:44:46 +02:00
Nolwenn
4b26826955 mails 2017-08-30 11:44:15 +02:00
Preprod mutu
17903f36e2 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:31:58 +02:00
Nolwenn
5495eeaeac recette 2017-08-30 11:31:02 +02:00
Preprod mutu
4073e3b80a Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:20:50 +02:00
Nolwenn
dfcf74e44b recette 2017-08-30 11:20:30 +02:00
Preprod mutu
c78f94d9f1 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 10:42:24 +02:00
Nolwenn
d5829964f3 suite recette 2017-08-30 10:41:20 +02:00
Preprod mutu
3fd02badc3 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 09:50:59 +02:00
Nolwenn
a3bf081637 recette graphique + pages compte 2017-08-30 09:50:19 +02:00
Michael RICOIS
3b08c71f6a Fix product deletion in cart with configurator 2017-08-29 17:51:42 +02:00
Preprod mutu
d5bbc1272f Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-29 15:29:16 +02:00
Preprod mutu
d387bc5550 fix favicon 2017-08-29 15:29: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
936adcc6c3 recette + ekomi 2017-08-29 10:46:12 +02:00
Nolwenn
bd7e625a5e Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-28 14:52:37 +02:00
Nolwenn
fb737f4508 recette choco 2017-08-28 14:49:09 +02:00
Preprod mutu
5e875c0f4a recette 2017-08-25 10:05:36 +02:00
Preprod mutu
6c269bd0c7 fix form checkbox 2017-08-24 18:17:43 +02:00
Nolwenn
269e5804bd responsive suite 2017-08-24 17:27:05 +02:00
Nolwenn
135fad692f Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-24 16:40:40 +02:00
Nolwenn
32d991082f crumb 2017-08-24 16:40:34 +02:00
Preprod mutu
4017e74863 form simulator bicolor 2017-08-24 16:39:00 +02:00
Preprod mutu
29cc17504f formulaires fiche configirateurs 2017-08-24 16:02:55 +02:00
Preprod mutu
4c57b48b7d simulator 2017-08-24 12:40:55 +02:00
Preprod mutu
473bbb2b95 modif instagram + antadisconfigurator + antadis smulator 2017-08-24 11:05:17 +02:00
Preprod mutu
f468bd216f Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-24 09:12:11 +02:00
Nolwenn
88cedb9bdc tunnel + FP 2017-08-23 18:19:01 +02:00
Preprod mutu
a6be44a7c4 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-23 15:31:45 +02:00
Preprod mutu
85f4c8331e instagram 2017-08-23 15:31:28 +02:00
Michael RICOIS
eb937ff772 Add all images, even if we need to rename image 2017-08-23 14:52:28 +02:00
Michael RICOIS
3543998984 Remove type="date"
With chrome jquery.ui.datepicker and type="date" are in conflict
2017-08-23 13:00:36 +02:00
Nolwenn
de1e18230e responsive 2017-08-23 12:18:30 +02:00
Nolwenn
37a9744575 responsive again 2017-08-22 19:06:13 +02:00
Nolwenn
26da659055 fiche produit libelles 2017-08-22 17:33:26 +02:00