Commit Graph

800 Commits

Author SHA1 Message Date
Romu
9960cb8411 Merge branch 'ticket/r12069-vente-flash' into develop 2017-01-09 05:52:45 -08:00
Romu
1fc2d3db5b border + promo 2017-01-09 05:52:04 -08:00
Romu
a5225b9d73 Merge branch 'ticket/r12069-vente-flash' into develop 2017-01-09 03:38:21 -08:00
Romu
417ce72727 longueur description 2017-01-09 03:38:05 -08:00
Romu
5c0b3f00f6 Merge branch 'ticket/r12069-vente-flash' into develop 2017-01-09 03:32:17 -08:00
Romu
7450daaee2 produit edito 2017-01-09 03:30:37 -08:00
Romu
8838e507c8 listing produit + bouton page dédiée 2017-01-09 03:09:16 -08:00
Romu
e9707048cd vente flash colonne + test listing 2017-01-09 01:13:01 -08:00
Nolwenn
d4e4dfb502 fix test 2017-01-09 10:09:31 +01:00
Romu
ab331104a1 Merge branch 'ticket/r12069-vente-flash' into develop 2017-01-05 08:37:01 -08:00
Romu
af17ecc707 versionning icomoon 2017-01-05 08:36:40 -08:00
Romu
c1c321e578 Merge branch 'ticket/r12069-vente-flash' into develop 2017-01-05 08:08:14 -08:00
Romu
e3c636c9fa fix css 2017-01-05 08:05:59 -08:00
Romu
2d2ad84158 mise en place listing, page produit et page dédié 2017-01-05 07:11:22 -08:00
Romu
2ced845b55 add module 2017-01-05 01:35:41 -08:00
Romu
6737909e99 fix conflict 2017-01-05 01:25:08 -08:00
ToutPratique
021956f9ac logo noel 2017-01-04 09:57:29 +01:00
Romu
78a7595e7f fix conflict 2016-12-23 02:01:30 -08:00
Nolwenn
ca768bf16b fixs 2016-12-23 10:29:27 +01:00
Nolwenn
58bd870eae modif affichage postedito 2016-12-21 15:30:23 +01:00
ToutPratique
995005fc70 fix css 2016-12-20 10:43:44 +01:00
ToutPratique
98c821b4b2 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-12-20 10:32:11 +01:00
ToutPratique
04ea7159ac opti front 2016-12-20 10:32:01 +01:00
Romu
f7d03dbac6 Merge branch 'ticket/r11769-traffic-boutique_suite' into develop 2016-12-16 02:40:34 -08:00
Nolwenn
b1ef540b40 Merge branch 'ticket/r11769-traffic-boutique_suite' of gitlab.antadis.net:dev-antadis/toutpratique into ticket/r11769-traffic-boutique_suite 2016-12-16 11:20:16 +01:00
Nolwenn
a4a110b822 fix slideshow 2016-12-16 11:19:56 +01:00
Romu
95ac37bcbc Merge branch 'ticket/r11769-traffic-boutique_suite' of gitlab.antadis.net:dev-antadis/toutpratique into ticket/r11769-traffic-boutique_suite 2016-12-16 02:06:41 -08:00
Romu
836c1e497f condition type de page 2016-12-16 02:06:18 -08:00
Nolwenn
0e2b7e9739 fix img centre + pb ecrasement variable edito 2016-12-16 11:03:10 +01:00
Romu
762061818a params edito 2016-12-16 01:52:51 -08:00
Romu
fb77eef4ad Merge branch 'develop' of gitlab.antadis.net:dev-antadis/toutpratique into develop 2016-12-16 00:59:41 -08:00
Nolwenn
4f81d16de1 slideshow 20s 2016-12-15 15:12:59 +01:00
Nolwenn
0e7a9c420c slide show 2016-12-15 15:10:14 +01:00
Nolwenn
b25e10e379 condition sans produit 2016-12-15 13:30:46 +01:00
Nolwenn
acade4c9d7 modif cms edito 2016-12-15 13:24:25 +01:00
Thibault UBUNTU
8f778fc0c0 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-12-14 12:32:43 +01:00
Thibault UBUNTU
76277292f3 Merge branch 'ticket/r11769-produitedito' into develop 2016-12-14 12:27:59 +01:00
Romu
2022fd0e7b Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique into develop 2016-12-13 01:32:29 -08:00
ToutPratique
44e84d9849 new tpl homestore 2016-12-13 10:29:12 +01:00
ToutPratique
6ea462189e fix 5 produits sur le homestore 2016-12-13 10:20:41 +01:00
ToutPratique
dabfd19529 add removecache on processDelete 2016-12-12 18:23:16 +01:00
ToutPratique
450723055a fix clearcache category 2016-12-12 18:09:16 +01:00
Thibault UBUNTU
cad96f25d5 add product relation object to edito tpl 2016-12-12 17:05:25 +01:00
Thibault UBUNTU
73a1e2847e add product/pack to edito 2016-12-12 16:55:31 +01:00
ToutPratique
fa9de90b58 fix 2016-12-12 12:54:12 +01:00
ToutPratique
5929079d7c fix 2016-12-12 11:16:30 +01:00
ToutPratique
1e94384799 fix 2016-12-12 10:56:16 +01:00
Romu
45d64346d0 Merge branch 'ticket/r11769-inte-homefeatured' 2016-12-12 01:40:53 -08:00
Romu
c462707463 Merge branch 'ticket/r11769-inte-homefeatured' into develop 2016-12-08 03:40:55 -08:00
Romu
d8cd18973b modif home astuce 2016-12-08 03:40:16 -08:00