Commit Graph

802 Commits

Author SHA1 Message Date
Romu
d4ea4823b2 Merge branch 'ticket/r13457-flag-new-product' into develop 2017-06-15 00:58:24 -07:00
Romu
4c0bc31577 css 2017-06-15 00:58:06 -07:00
Romu
3b06bed0af Merge branch 'ticket/r13457-flag-new-product' into develop 2017-06-13 01:19:10 -07:00
Romu
1cd90dd595 label promo 2017-06-13 01:18:47 -07:00
Romu
31f873e760 Merge branch 'ticket/r13457-flag-new-product' into develop 2017-06-13 00:59:56 -07:00
Romu
95af59f476 skin nouveau fiche produit 2017-06-13 00:59:36 -07:00
Michael RICOIS
1febb99865 Add preg_match (emailregex.com) to better email validation 2017-06-06 17:07:55 +02:00
Michael RICOIS
8381e4a407 Fix error 500 - Product 2017-06-06 15:44:41 +02:00
Michael RICOIS
da073e3da1 Add set_time_limit(600) 2017-06-06 15:05:37 +02:00
Michael
0777852615 Merge branch 'ticket/r13253-module-upela' into 'master'
Ticket/r13253 module upela

See merge request !11
2017-06-06 15:04:35 +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
59e057bccc Ticket r13417 - change max_execution_time 2017-06-06 10:30:38 +02:00
Michael RICOIS
dc9199e255 Merge branch 'ticket/r13253-module-upela' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into ticket/r13253-module-upela 2017-06-01 15:02:06 +02:00
Michael RICOIS
166361c3fa Add module Upela 2017-06-01 15:01:40 +02:00
Michael RICOIS
12b56d401a Merge remote-tracking branch 'origin/master' into develop 2017-06-01 14:59:59 +02:00
Michael RICOIS
650a9eff67 Add module Upela 2017-06-01 14:49:31 +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
b5fc8defed remove one js file 2017-05-26 15:18:35 +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
907eb96440 Merge branch 'ticket/r13185-product-new' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into ticket/r13185-product-new 2017-05-18 10:11:14 +02:00
Michael RICOIS
cac71f077f Fix texte on failling product 2017-05-18 10:10:52 +02:00
Michael RICOIS
c6fe06e24b Fix texte on failling product 2017-05-18 10:09:27 +02:00
Michael RICOIS
93f24be05a Merge branch 'master' into develop 2017-05-18 10:05:56 +02:00
Michael RICOIS
fca769f29b Merge remote-tracking branch 'origin/ticket/r13185-product-new' into develop 2017-05-17 17:52:07 +02:00
Michael RICOIS
d588f03f92 Change label 2017-05-17 16:16:11 +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
Michael RICOIS
f9a3af2d6b script to associate product with category 83 2017-05-17 12:20:24 +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
Thibault GUILLAUME
618edc1b19 Merge branch 'ticket/r13185-lightbox-accessories' into 'master'
Ticket/r13185 lightbox accessories

See merge request !7
2017-05-17 11:09:53 +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
a8629fdbed Merge branch 'ticket/r13185-lightbox-accessories' into 'develop'
Ticket/r13185 lightbox accessories

See merge request !4
2017-05-11 13:02:44 +02:00
Michael RICOIS
a6553625a2 Remove comment 2017-05-11 12:59:53 +02:00
Michael RICOIS
8fc584c41e Change all link "Continue shopping" 2017-05-11 12:34:17 +02:00
Michael RICOIS
dc80d577c6 Fix assign link 2017-05-11 12:19:21 +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
154ef8a567 Merge branch 'ticket/r12579-payzen-hr' into 'develop'
Ticket/r12579 payzen hr

See merge request !2
2017-05-11 10:48:28 +02:00
Michael RICOIS
61640ccd45 Merge branch 'ticket/r12579-payzen-hr' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into ticket/r12579-payzen-hr 2017-05-11 09:17:07 +02: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