Commit Graph

530 Commits

Author SHA1 Message Date
Michael RICOIS
10f8211888 Merge remote-tracking branch 'origin/ticket/r13530-link-boutique' into develop 2017-08-08 17:04:47 +02:00
Michael RICOIS
5a2e6e0713 Redirect Menu "Boutique" to category 183 2017-08-08 17:03:54 +02:00
Michael RICOIS
4d1f0bbbf9 Replace image 2017-08-08 09:27:58 +02:00
Michael RICOIS
7e66761e52 Merge remote-tracking branch 'origin/ticket/r13541-h5div' 2017-07-21 09:35:44 +02:00
Michael RICOIS
282fae6b8d Merge remote-tracking branch 'origin/ticket/r13706-doofinder-badgateway'
into develop

Conflicts:
	themes/toutpratique/product-list.tpl
2017-07-11 14:31:30 +02:00
Nolwenn
28c8d500af Merge branch 'ticket/r13569-venteflash' into develop 2017-06-29 17:10:42 +02:00
Nolwenn
c47b7fd7ee ticket vente flash 2017-06-29 13:14:29 +02:00
ToutPratique
26b5a6a3ad fix product-list 2017-06-29 12:49:17 +02:00
Michael RICOIS
6d8090d708 Close div 2017-06-22 11:49:04 +02:00
Michael RICOIS
6950fdaf14 h5 to div 2017-06-22 11:43:09 +02:00
Michael RICOIS
d430d73bcd Revert "Newsletter H5 to div"
This reverts commit 9452a93d64.
2017-06-22 10:32:14 +02:00
Michael RICOIS
7c8e4b5314 Revert "Newsletter h5 to div"
This reverts commit 951ba27913.
2017-06-22 10:32:11 +02:00
Michael RICOIS
6ba413fd18 Revert "CSS"
This reverts commit ac3b1c638f.
2017-06-22 10:30:56 +02:00
Michael
50e5ac74b7 Merge branch 'ticket/r13185-productpack' into 'master'
Ticket/r13185 productpack

See merge request !15
2017-06-20 10:02:04 +02:00
Michael RICOIS
ac3b1c638f CSS 2017-06-15 16:19:38 +02:00
Michael RICOIS
951ba27913 Newsletter h5 to div 2017-06-15 16:08:59 +02:00
Michael RICOIS
9452a93d64 Newsletter H5 to div 2017-06-15 16:04:39 +02:00
Romu
59e2be81e4 css 2017-06-15 01:14:25 -07:00
Romu
ec1e33bcb7 css 2017-06-15 01:01:18 -07:00
Romu
4c0bc31577 css 2017-06-15 00:58:06 -07:00
Michael RICOIS
b7c11c5ae5 h5 to h2 on product (category "marque") 2017-06-13 10:25:08 +02:00
Romu
1cd90dd595 label promo 2017-06-13 01:18:47 -07:00
Michael RICOIS
e5e0c9575b Delete price product on pack 2017-06-13 10:11:54 +02:00
Romu
95af59f476 skin nouveau fiche produit 2017-06-13 00:59:36 -07:00
Michael RICOIS
8381e4a407 Fix error 500 - Product 2017-06-06 15:44:41 +02:00
Michael
4561da74fd Merge branch 'ticket/r13185-product-new' into 'master'
Ticket/r13185 product new

See merge request !10
2017-06-06 15:02:54 +02:00
Michael RICOIS
632379a2a0 Be sure div only display on CMS page (ticket/r13361) 2017-05-29 14:38:10 +02:00
Rémy
39a6557714 suppression margin-bottom sur h1 catégorie 2017-05-29 10:18:28 +02:00
Rémy
b7b4865353 prix en baisse et nouveautés sur product list 2017-05-26 16:09:33 +02:00
ToutPratique
9dd16f8b65 remove one file js voting 2017-05-26 15:19:11 +02:00
ToutPratique
54b55fbd6b optim image 2017-05-26 12:37:54 +02:00
ToutPratique
13632959bb remove tags 2017-05-26 10:23:40 +02:00
Michael RICOIS
cac71f077f Fix texte on failling product 2017-05-18 10:10:52 +02:00
Michael RICOIS
93f24be05a Merge branch 'master' into develop 2017-05-18 10:05:56 +02:00
Michael RICOIS
fd6ec8139c Add failling price 2017-05-17 16:12:12 +02:00
ToutPratique
ab0acda726 add div pub lagardere 2017-05-17 15:45:47 +02:00
Thibault GUILLAUME
ad546054ac Merge branch 'ticket/r13185-link-continue' into 'master'
Ticket/r13185 link continue

See merge request !8
2017-05-17 11:23:59 +02:00
ToutPratique
a46e20732f change equipe number 2017-05-17 11:08:19 +02:00
ToutPratique
a6f450c5f2 change numero contact 2017-05-17 11:08:06 +02:00
Michael RICOIS
bb739811fe Try to make css 2017-05-12 15:43:12 +02:00
Michael RICOIS
ea2e7b585d New product display
Don't forget to change settings in 'Préférences > Produits > Nombre de
jours durant lesquels un produit est considéré comme "nouveau"'
2017-05-11 17:29:22 +02:00
PIERONKIEWIEZ
a9d54988f5 Merge branch 'ticket/r12579-payzen-hr' into 'master'
Ticket/r12579 payzen hr

See merge request !6
2017-05-11 15:33:04 +02:00
Michael
58a7b2fc56 Merge branch 'ticket/r13185-link-continue' into 'develop'
Ticket/r13185 link continue

See merge request !5
2017-05-11 13:03:41 +02:00
Michael RICOIS
8fc584c41e Change all link "Continue shopping" 2017-05-11 12:34:17 +02:00
Romu
3c95debeac Merge branch 'ticket/r12941-optinmonster' into develop 2017-05-11 02:56:50 -07:00
Romu
33dd3013ee tag optinmonster 2017-05-11 02:56:25 -07:00
Michael RICOIS
36849721fc Don't toggle when no payzen_card_type 2017-05-11 09:13:34 +02:00
Michael RICOIS
1934edc9e0 Merge branch 'master' into develop 2017-05-11 09:12:02 +02:00
Michael RICOIS
ffd167a1c5 Redirect bouton link to category 183 2017-05-05 17:26:21 +02:00
ToutPratique
3afc1c78d5 payzen 2017-04-28 17:39:44 +02:00