351 Commits

Author SHA1 Message Date
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
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
Michael RICOIS
0fa18ba339 Fix same product in cart and configurator 2017-08-29 16:28:00 +02:00
Michael RICOIS
2dd0113e0f Remove debug 2017-08-29 15:35:19 +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
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
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
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
Michael RICOIS
9d19197de8 Try to have default_pagination to 300 2017-08-24 18:01:45 +02:00