232 Commits

Author SHA1 Message Date
Preprod mutu
c7ca03cf57 tnt 2017-09-19 16:48:02 +02:00
Michael RICOIS
5614f2c917 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-09-19 16:44:28 +02:00
Michael RICOIS
872cd193b6 Move label 2017-09-19 16:44:16 +02:00
Preprod mutu
3cfd8c61fe trad 2017-09-19 16:39:01 +02:00
Preprod mutu
e9a84e888c rm configurator them 2017-09-19 16:38:17 +02:00
Michael RICOIS
40bb3d3443 Fix hidden fields 2017-09-19 16:04:14 +02:00
Michael RICOIS
0bd22f16fb Texte 2017-09-19 12:08:11 +02:00
Michael RICOIS
fac1dcae7b Update tpl 2017-09-19 11:57:05 +02:00
Michael RICOIS
549b97c385 Vieux Rose 2017-09-18 16:01:07 +02:00
Michael RICOIS
0d6f24a314 Fix adding empty option 2017-09-15 14:50:04 +02:00
Michael RICOIS
bea442a031 Reset textarea 2017-09-14 09:40:17 +02:00
Michael RICOIS
2f51d65168 Gestion des images des elements exclusifs 2017-09-13 17:33:41 +02:00
Michael RICOIS
2af0984df1 Color : bordeau 2017-09-13 15:54:26 +02:00
Michael RICOIS
39cfa63fd6 Image vrac et sachet bicolor 2017-09-13 14:55:09 +02:00
Michael RICOIS
83dcc7a2c4 Ajustement 2017-09-13 14:53:50 +02:00
Michael RICOIS
2086d3c18a Vrac : set theme 2017-09-13 12:34:51 +02:00
Michael RICOIS
171cd8e55f sachet thematique : set theme 2017-09-13 12:28:11 +02:00
Michael RICOIS
7281809b19 TYPEEVE 2017-09-13 12:13:56 +02:00
Michael RICOIS
63a40ab35b Double cube exclusif 2017-09-12 17:17:11 +02:00
Michael RICOIS
0f0cd88ab0 Image 2017-09-12 12:45:50 +02:00
Michael RICOIS
30c1bd3880 Ajout gestion image 2017-09-12 11:29:19 +02:00
Preprod mutu
dc0edebeb0 tnt 2017-09-12 10:48:51 +02:00
Preprod mutu
5aa52ffabd modif inté simulator 2017-09-12 10:29:30 +02:00
Michael RICOIS
a81263d65c Color bordeaux 2017-09-12 09:55:20 +02:00
Michael RICOIS
9f9bc2cf39 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-09-12 09:23:02 +02:00
Preprod mutu
7a90ad210f simulator fix inté 2017-09-11 18:34:07 +02:00
Michael RICOIS
0838f3181b Update doublecube bicolor 2017-09-11 18:20:35 +02:00
Michael RICOIS
e1254b6561 Order By 2017-09-11 17:23:15 +02:00
Michael RICOIS
ab66dbede2 Création theme 2017-09-11 17:13:11 +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
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
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