1405 Commits

Author SHA1 Message Date
Marion Muszynski
a224bfd940 Merge branch 'ticket-10657-PhileaMulti' 2016-11-21 13:01:13 +01:00
Marion Muszynski
c2b5077efe fix 2016-11-21 12:56:12 +01:00
Marion Muszynski
66bdae1aef prevent combination of sale exp classic and sale exp before noel 2016-11-21 12:45:20 +01:00
Marion Muszynski
2ee444b269 Merge branch 'ticket-11211-MultiDeleteImg' 2016-11-21 10:36:20 +01:00
Marion Muszynski
8ec2a6ba21 Merge branch 'ticket-10657-PhileaMulti' 2016-11-21 10:18:38 +01:00
Marion Muszynski
2057327981 Merge branch 'add-module-privatesales_shipping' 2016-11-21 10:11:54 +01:00
Marion Muszynski
83d3523000 addition of module for privatesales shipping 2016-11-21 10:11:27 +01:00
Marion Muszynski
603045e422 Merge branch 'ticket-11247-MailParrainageFix' 2016-11-21 10:07:44 +01:00
Marion Muszynski
a8cb07e932 remove mail sending for log 2016-11-21 10:07:20 +01:00
Marion Muszynski
f5a841a2f1 adjust for exp Noel 2016-11-18 17:26:53 +01:00
Marion Muszynski
d9fbfc438a small fix 2016-11-18 12:24:37 +01:00
Marion Muszynski
9836172e29 addition of privatesales_shipping module 2016-11-18 12:11:41 +01:00
Marion Muszynski
58dbc97845 adjusting in adminPhilea 2016-11-18 12:09:00 +01:00
Marion Muszynski
8d414f71fd Merge branch 'ticket-11123-FixSimilarProducts' 2016-11-18 11:13:28 +01:00
Marion Muszynski
d91720a2d4 adapt the modif to thumb img 2016-11-18 10:54:38 +01:00
Marion Muszynski
368448948f Merge branch 'ticket-11247-MailParrainageFix' 2016-11-18 10:04:24 +01:00
Marion Muszynski
78737caa39 fix to prevent email sending to bebeboutik.com 2016-11-18 10:04:06 +01:00
Marion Muszynski
4ac4753900 begining of updatings 2016-11-18 09:50:04 +01:00
Marion Muszynski
c6ef2d7e5b Merge branch 'ticket-11247-MailParrainage' 2016-11-17 10:28:11 +01:00
Marion Muszynski
99a30df8b2 remove mail sending 2016-11-17 10:27:53 +01:00
Marion Muszynski
10fb451e5f Merge branch 'ticket-11247-MailParrainage' 2016-11-16 17:39:32 +01:00
Marion Muszynski
4abd6f0d5c fix id_lang 2016-11-16 17:39:18 +01:00
Marion Muszynski
e4921746e4 Merge branch 'ticket-11247-MailParrainage' 2016-11-16 16:33:26 +01:00
Marion Muszynski
3a0ba4c19e addition of email checking 2016-11-16 16:33:07 +01:00
Marion Muszynski
31ea35e160 selection only a specific category_family 2016-11-16 15:50:39 +01:00
Marion Muszynski
e29e86cf42 addition of wsu for LaPoste webservices 2016-11-16 12:28:39 +01:00
Marion Muszynski
fc86cfd982 Merge branch 'fix-AideContact' 2016-11-15 11:51:43 +01:00
Marion Muszynski
4f9add049e addition redirect to all forms 2016-11-15 11:48:52 +01:00
Marion Muszynski
e52b90f790 Merge branch 'fix-AideContact' 2016-11-15 10:44:05 +01:00
Marion Muszynski
a839bafd66 addition of redirection to the good form 2016-11-15 10:43:45 +01:00
Marion Muszynski
05d15188b6 Merge branch 'fix-AideContact' 2016-11-15 10:31:48 +01:00
Marion Muszynski
684d096c48 modif css and redirection to the good form 2016-11-15 10:28:52 +01:00
Marion Muszynski
2e8468df7e Merge branch 'fix-AideContact' 2016-11-14 14:38:43 +01:00
Marion Muszynski
2645434803 openning to customers 2016-11-14 14:38:23 +01:00
Marion Muszynski
af0f6ca700 Merge branch 'fix-AideContact' 2016-11-14 14:22:22 +01:00
Marion Muszynski
a5629eb2c7 adjusting mobile version 2016-11-14 14:19:28 +01:00
Marion Muszynski
708f800f48 Merge branch 'fix-AideContact' 2016-11-14 10:58:47 +01:00
Marion Muszynski
492740d02d fix the name of forms 2016-11-14 10:58:28 +01:00
Marion Muszynski
7cee5d97c4 Merge branch 'ticket-11557-FixLinkSaleCategory' 2016-11-10 16:26:13 +01:00
Marion Muszynski
a13a8813ea comment sending mail 2016-11-10 16:25:56 +01:00
Marion Muszynski
e34bef4bd2 small fix 2016-11-10 16:09:09 +01:00
Marion Muszynski
e7413fd51e add of multi delete option 2016-11-10 13:21:20 +01:00
Marion Muszynski
2daa5010f6 Merge branch 'ticket-11621-fixLogoMobile' 2016-11-10 12:31:18 +01:00
Marion Muszynski
04b5314a96 change logo width on mobile version 2016-11-10 12:30:51 +01:00
Marion Muszynski
ca38824e83 restriction on liston and listoff 2016-11-10 10:36:14 +01:00
Marion Muszynski
9a9a222552 simplification of img uploaded in privatesale 2016-11-09 17:50:41 +01:00
Marion Muszynski
e71c932a21 Merge branch 'ticket-11557-FixLinkSaleCategory' 2016-11-09 11:22:11 +01:00
Marion Muszynski
a1f1eca990 addition of mail sending to check bad behaviours 2016-11-09 11:19:05 +01:00
Marion Muszynski
669067bc5c Merge branch 'ticket-ChangeDeliveryAddress' 2016-11-08 16:11:24 +01:00
Marion Muszynski
ec2694f052 addition of country restriction 2016-11-08 16:09:41 +01:00