144 Commits

Author SHA1 Message Date
Preprod mutu
2299ebeb62 recette responsive suite 2017-09-08 18:15:31 +02:00
Michael RICOIS
b02485a374 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-09-08 16:52:02 +02:00
Michael RICOIS
2e082218e9 Envoi nouvelles images 2017-09-08 16:51:47 +02:00
Preprod mutu
9fe1e58cd2 recette 2017-09-08 15:40:02 +02:00
Preprod mutu
89f4aa4475 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-09-08 11:33:11 +02:00
Preprod mutu
468f93d07f recette graphique 2017-09-08 11:32:56 +02:00
Michael RICOIS
66b8570484 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-09-07 17:59:25 +02:00
Michael RICOIS
b3f203bd1a Limite la sélection des parfums 2017-09-07 17:59:11 +02:00
Nolwenn
ed8cd9913f recette 2017-09-07 15:32:41 +02:00
Nolwenn
350933c7d7 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-09-07 12:42:37 +02:00
Nolwenn
b0ebc71e42 recette 2 2017-09-07 12:42:31 +02:00
Preprod mutu
a750816751 solve conflict 2017-09-07 11:29:33 +02:00
Preprod mutu
5c7ea7cd78 recette 2017-09-07 11:09:20 +02:00
Nolwenn
178518a772 recette 2 2017-09-07 11:08:38 +02:00
Nolwenn
98acf00493 recette 2017-09-07 10:14:06 +02:00
Nolwenn
6fae379d39 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-09-06 09:43:59 +02:00
Michael RICOIS
fdc84b0934 Radio and Checkbox must be table 2017-09-05 17:55:30 +02:00
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
Nolwenn
b3bccb140e recett inté 2017-09-04 18:25:45 +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