Commit Graph

816 Commits

Author SHA1 Message Date
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
Romu
3baee317c7 changement disposition des elements dans l'edito de la home 2016-12-07 09:10:20 -08:00
Romuald
f88dc3332d Merge branch 'logo-noel' into develop 2016-12-06 10:18:15 +01:00
Romuald
6f2a71be31 logo de nowel 2016-12-06 10:16:16 +01:00
Romuald
13daab77c0 Merge branch 'ticket/r11769-inte-homefeatured' into develop 2016-12-02 11:39:31 +01:00
Romuald
8da49f31bc maj coche dans le produit pour remonté produit 2016-12-02 11:38:22 +01:00
Romuald
411f822d7c Merge branch 'ticket/r11769-inte-homefeatured' into develop 2016-12-02 10:16:35 +01:00
Romuald
4c915b7540 truncate plus petit 2016-12-02 10:15:50 +01:00
Romuald
2f33147044 fix conflict 2016-12-02 10:06:02 +01:00
Romuald
7bc3a3e97a remonté edito home 2016-12-01 17:04:09 +01:00
Nolwenn
5d9de8c0bf fix conflict 2016-12-01 14:49:01 +01:00
Romuald
3ade87d0dc Merge branch 'ticket/r11833-hotjar' 2016-11-30 17:24:49 +01:00
Romuald
6bd31540fd fix conflict 2016-11-30 15:15:21 +01:00
Romuald
8cda4a1b8e Merge branch 'ticket/r11575-discrete_cookie' 2016-11-30 15:13:02 +01:00
Romuald
668fbc4979 Merge branch 'ticket/r11575-discrete_cookie' into develop 2016-11-28 17:47:40 +01:00
Romuald
9d08b636ed border 2016-11-28 17:47:11 +01:00
Romuald
0696b9dc62 Merge branch 'ticket/r11833-hotjar' into develop 2016-11-28 17:29:42 +01:00
Romuald
23d31f0190 fix conflict 2016-11-28 17:29:39 +01:00
Romuald
db37d2cad2 Merge branch 'ticket/r11575-discrete_cookie' into develop 2016-11-28 17:27:16 +01:00
Romuald
c7f524a051 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique into develop 2016-11-28 17:24:55 +01:00
Romuald
0d4edb6d0c correction listing produit sur la page produit 2016-11-28 16:08:46 +01:00
Romuald
8b26688243 correction display 2016-11-28 15:47:39 +01:00
ToutPratique
8630ed8861 petit oubli cache 2016-11-28 15:40:35 +01:00
ToutPratique
3fa5a177c7 repairt netreviews cache 2016-11-28 15:39:39 +01:00
Thibault UBUNTU
dfd7c0a59c repair clearcache 2016-11-28 15:24:56 +01:00
Romuald
fe6888b368 fix display 2016-11-28 14:47:47 +01:00
Romuald
5054cdefc3 mise en place du tag 2016-11-25 12:02:27 +01:00
Romuald
2f35f48af8 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/toutpratique into develop 2016-11-25 11:48:46 +01:00
Nolwenn
393c82d622 ticket/r11575 - bandeau cookie 2016-11-24 12:01:02 +01:00
Nolwenn
3b8aeed6b0 ticket/r11766-avis_verifies 2016-11-23 15:52:30 +01:00
ToutPratique
e5e6a8ae9e cache picto 2016-11-22 14:33:00 +01:00
ToutPratique
6d79bcf3eb fix netrevienws call static 2016-11-22 12:39:02 +01:00
ToutPratique
69fe434f77 add cache to netreviews foreach id product 2016-11-22 12:00:24 +01:00
ToutPratique
5cec889295 remove conflict 2016-11-22 10:13:35 +01:00
Thibault UBUNTU
1ba7af822e Merge branch 'ticketS/r11571-sogenactif' 2016-11-21 16:47:50 +01:00