2102 Commits

Author SHA1 Message Date
Marion Muszynski
84e306d811 Merge branch 'ticket-12803-ModifSimilarProduct' 2017-07-04 15:02:39 +02:00
Marion Muszynski
18da9c8c75 change image size 2017-07-04 10:57:31 +02:00
Marion Muszynski
d726131b76 css modification of similar product 2017-07-04 10:46:06 +02:00
Marion Muszynski
40fe9a97b8 fix css 2017-07-03 10:15:21 +02:00
Marion Muszynski
13b68d20ae moving gift message to shopping cart step 2017-06-30 12:57:06 +02:00
Marion Muszynski
967eac2c06 Merge branch 'ticket-13505-retourMobile' 2017-06-29 14:24:30 +02:00
Marion Muszynski
7a6771ba27 add javascript back to last page 2017-06-29 14:24:12 +02:00
Marion Muszynski
97ec91fdfa Merge branch 'fix-deleteCustomer' 2017-06-28 15:01:13 +02:00
Marion Muszynski
c6c5ad32ca fix delete customer 2017-06-28 15:00:53 +02:00
Marion Muszynski
b0eac9b37e Merge branch 'ticket-13560-BannerMobile' 2017-06-28 12:45:38 +02:00
Marion Muszynski
cd390c8fb9 add promo banner for ps 2017-06-28 12:18:03 +02:00
Marion Muszynski
b87d25038f addition of module ant_promobanner 2017-06-27 18:22:24 +02:00
Marion Muszynski
407da54291 ready for first tests 2017-06-27 12:10:10 +02:00
Marion Muszynski
0dc183b5a8 Merge branch 'ticket-13166-RetourProcess_3' 2017-06-27 10:12:40 +02:00
Marion Muszynski
db8e0ffcce addition of selection by ean 2017-06-27 10:12:22 +02:00
Marion Muszynski
c4c8ca8ef6 Merge branch 'ticket-13166-RetourProcess_3' 2017-06-26 11:58:14 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
9c51d607c1 Merge branch 'ticket-13166-upgradeReturnPart2' 2017-06-23 12:28:05 +02:00
Marion Muszynski
2a5e3d861b fix label 2017-06-23 12:27:50 +02:00
Marion Muszynski
5f28f49b51 modification reason,instruction and comment 2017-06-23 12:24:55 +02:00
Marion Muszynski
86c27e3ba3 Merge branch 'ticket-BandeauMobile' 2017-06-23 11:01:01 +02:00
Marion Muszynski
94fe7668a4 add promo in sale page 2017-06-23 11:00:46 +02:00
Marion Muszynski
013edd892f Merge branch 'ticket-BandeauMobile' 2017-06-23 10:41:36 +02:00
Marion Muszynski
fd003a8443 add img promo 2017-06-23 10:41:25 +02:00
Marion Muszynski
2c78e0ac86 Merge branch 'ticket-BandeauMobile' 2017-06-23 10:40:33 +02:00
Marion Muszynski
c44bcdb281 add promo es on mobile version 2017-06-23 10:40:19 +02:00
Marion Muszynski
45431b2bb1 Merge branch 'ticket-13550-FixPayboxDirect' 2017-06-23 10:19:38 +02:00
Marion Muszynski
2b858963a3 add comment 2017-06-23 10:11:06 +02:00
Marion Muszynski
04518c98bc Merge branch 'ticket-BandeauMobile' 2017-06-22 17:34:38 +02:00
Marion Muszynski
6c4f773c7c addition of promo on mobile 2017-06-22 17:34:21 +02:00
Marion Muszynski
4572379dfc fix multi paiement and css 2017-06-22 16:53:29 +02:00
Marion Muszynski
9f25935902 Merge branch 'ticket-13389-3Dsecure' 2017-06-22 15:15:04 +02:00
Marion Muszynski
5d77439321 Merge branch 'ticket-13166-UpgradeReturnManager' 2017-06-22 11:38:52 +02:00
Marion Muszynski
4eb5fded0b start of moving to HMAC system 2017-06-22 11:38:36 +02:00
Marion Muszynski
d3e5dc18d0 test 2017-06-21 16:47:43 +02:00
Marion Muszynski
a3dc8fa981 add 3Dsecure 2017-06-21 16:37:50 +02:00
Marion Muszynski
03c6b2c8bd modif 2017-06-21 15:54:34 +02:00
Marion Muszynski
805d225840 ergo changement and cleaning cron 2017-06-21 14:44:10 +02:00
Marion Muszynski
1524ec205c Merge branch 'ticket-13532-ProductDisable' 2017-06-20 11:46:50 +02:00
Marion Muszynski
92bd1d406d fix css 2017-06-20 10:59:11 +02:00
Marion Muszynski
1f971275a0 multiple disable/enable product 2017-06-20 10:09:07 +02:00
Marion Muszynski
12e744b313 Merge branch 'ticket-9103-UrlMetaCategory' 2017-06-20 09:51:32 +02:00
Marion Muszynski
b9edddd928 Merge branch 'ticket-13532-ProductDisable' 2017-06-20 09:45:04 +02:00
Marion Muszynski
15e76afb93 multi disable/enable product 2017-06-19 17:48:38 +02:00
Marion Muszynski
2237a0df03 start of new extract 2017-06-19 17:04:16 +02:00
Marion Muszynski
3b2bf29f7f Merge branch 'ticket-13516-removeCategoryAddButton' 2017-06-19 12:21:28 +02:00
Marion Muszynski
fec2e5ba19 remove add buttom 2017-06-19 12:18:25 +02:00
Marion Muszynski
6d09c9ca30 Merge branch 'ticket-13324-pixelFB' 2017-06-19 11:06:27 +02:00
Marion Muszynski
86ccf2ef15 check if customer already exists to prevent fb tracking resending for registration 2017-06-19 11:05:46 +02:00
Marion Muszynski
dadf16f8fb separate la poste invoices and mr invoices 2017-06-16 17:51:19 +02:00