Commit Graph

2589 Commits

Author SHA1 Message Date
Michael RICOIS
5e3c35b95b Modification et affichage adresse socolissimo lorsque livraison domicile 2017-12-21 10:12:16 +01:00
Michael RICOIS
5eb320c4de Ajout exclusion 2017-12-20 11:52:56 +01:00
Michael RICOIS
07b607cfc2 Merge remote-tracking branch 'origin/ticket/15014-invite_credits' 2017-12-20 11:04:41 +01:00
Michael RICOIS
1116cb292f Merge remote-tracking branch 'origin/ticket/r15128-sponsor' 2017-12-20 11:03:07 +01:00
David
9e25127b26 fix 2017-12-18 15:54:59 +01:00
David
1376e0af07 Product name is longer in product list and product page 2017-12-18 15:12:38 +01:00
Michael RICOIS
326de6a61f Review how cookie works 2017-12-18 14:39:57 +01:00
Michael RICOIS
1293f573b6 CS 2017-12-18 12:47:38 +01:00
Michael RICOIS
02ddea5e16 Try to redefine cooki if sponsor has changed 2017-12-18 12:46:16 +01:00
David
3355f94386 Fixed jquery compatibility 2017-12-18 12:09:50 +01:00
Michael RICOIS
08f522bc36 Debug, CS 2017-12-18 12:08:24 +01:00
Michael RICOIS
fc5991dce9 Delete 2017-12-18 09:49:22 +01:00
Michael RICOIS
19a7b71030 Merge branch 'ticket/15116-nous-contacter-display' 2017-12-14 09:40:01 +01:00
Michael RICOIS
ad584e21e0 Merge branch 'ticket-14698-sensefuel' 2017-12-13 17:57:49 +01:00
Michael RICOIS
517ae660e7 set form class to std 2017-12-13 16:14:04 +01:00
Michael RICOIS
f73558c4d7 Merge branch 'feature/appmobile' 2017-12-13 15:00:09 +01:00
Michael RICOIS
29aa020049 SmartBanner as bricoprive.com 2017-12-13 14:53:48 +01:00
Michael RICOIS
ea28f83b52 Add smartbanner 2017-12-13 13:06:33 +01:00
Michael RICOIS
80c97d2867 Add hidden field to mobile 2017-12-13 11:49:06 +01:00
Michael RICOIS
6927c87ce0 Fill email2 2017-12-13 11:43:33 +01:00
Michael RICOIS
f51bcf62c9 Add hidden field for spam 2017-12-13 11:34:56 +01:00
Michael RICOIS
e5f83c46b4 Add invisible field 2017-12-13 11:29:56 +01:00
Michael RICOIS
d77173316f Merge branch 'feature/appmobile' 2017-12-13 10:36:10 +01:00
Michael RICOIS
1210b3de6e Add meta for app mobile 2017-12-13 10:20:56 +01:00
Michael RICOIS
3382d89a7e Get currency ISO 2017-12-12 17:58:23 +01:00
Michael RICOIS
850a678976 Add ean13 if available and ".html" suffix 2017-12-12 17:04:25 +01:00
Michael RICOIS
5cfc1793a0 Translation 2017-12-12 15:52:37 +01:00
Michael RICOIS
3091c094cd Translation 2017-12-12 15:12:26 +01:00
Marion Muszynski
0a6a26d716 Merge branch 'ticket-15084-FixReport' 2017-12-12 11:11:22 +01:00
Marion Muszynski
4bcfdbb767 fix order of crp 2017-12-12 11:11:09 +01:00
Michael RICOIS
5b675cdaa0 Prefer number 2017-12-11 16:28:16 +01:00
Michael RICOIS
a1752d2d68 Config var 2017-12-11 16:18:49 +01:00
Michael RICOIS
1a50acf40a Prepare wsdl locally 2017-12-11 15:18:58 +01:00
Michael RICOIS
af269cc4b2 CS 2017-12-11 15:18:32 +01:00
Michael RICOIS
b4128a0629 Enable flag to load locally the wsdl 2017-12-11 14:57:43 +01:00
Michael RICOIS
1d685e47cc Use local wsdl file 2017-12-11 14:50:25 +01:00
Michael RICOIS
66c4bfbdb9 Fix SoapClient emit 500 2017-12-11 12:33:36 +01:00
Marion Muszynski
17d8298afd Merge branch 'ticket-15084-FixReport' 2017-12-11 11:28:00 +01:00
Marion Muszynski
bebb9461d9 fix sort comment by id_sale 2017-12-11 11:27:44 +01:00
Michael RICOIS
0ca284d62c Translation ES 2017-12-08 10:18:16 +01:00
Michael RICOIS
f1fc24897b text 2017-12-07 17:37:52 +01:00
Michael RICOIS
850652caf7 Forget to add file 2017-12-07 17:28:47 +01:00
Michael RICOIS
4841e02436 Display credit 2017-12-07 17:17:52 +01:00
Marion Muszynski
42dfa81f9a Merge branch 'ticket-15062-confirmAlert' 2017-12-07 16:31:15 +01:00
Marion Muszynski
0d3ed321cf add confirm box on paypal refund button 2017-12-07 16:29:31 +01:00
root
78df0048af fix from prod 2017-12-07 15:08:30 +01:00
Marion Muszynski
6e962ea6f8 Merge branch 'ticket-14716-PictoAppliAdminOrders' 2017-12-07 15:03:19 +01:00
Michael RICOIS
c3cf35571d Remove .hg 2017-12-07 15:02:46 +01:00
Marion Muszynski
46ec23fd24 fix column width 2017-12-07 14:49:40 +01:00
Marion Muszynski
c85e23079b add png image 2017-12-07 14:46:19 +01:00