479 Commits

Author SHA1 Message Date
Michael RICOIS
ab66dbede2 Création theme 2017-09-11 17:13:11 +02:00
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
3401081d7e Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-09-08 15:40:14 +02:00
Preprod mutu
9fe1e58cd2 recette 2017-09-08 15:40:02 +02:00
Michael RICOIS
4c03703af2 Exclusif option name 2017-09-08 14:32:09 +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
e7d1a8a27c tnt 2017-09-07 11:10:07 +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
Nolwenn
420f640de5 tnt 2017-09-06 09:43:41 +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
0694d7f718 Test size in double cube 2017-09-04 16:05:30 +02:00
Michael RICOIS
05aedefdd6 Recette prix 2017-09-04 15:27:27 +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
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
1dae7493d2 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:44:30 +02:00
Nolwenn
4b26826955 mails 2017-08-30 11:44:15 +02:00
Michael RICOIS
55d93250c8 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-30 11:38:52 +02:00
Preprod mutu
a46aee54c0 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:38:47 +02:00
Nolwenn
2c2824eab2 recette suite (classe mail) 2017-08-30 11:38:38 +02:00
Michael RICOIS
4204c56d2c Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-30 11:38:34 +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
Preprod mutu
17903f36e2 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-30 11:31:58 +02:00