Marion Muszynski
|
3a0ba4c19e
|
addition of email checking
|
2016-11-16 16:33:07 +01:00 |
|
Marion Muszynski
|
fce88331a3
|
fix conflict
|
2016-11-16 15:55:07 +01:00 |
|
Marion Muszynski
|
31ea35e160
|
selection only a specific category_family
|
2016-11-16 15:50:39 +01:00 |
|
Marion Muszynski
|
4fa3f2cc1a
|
Merge branch 'ticket-10580-LaPosteWSU' into develop
|
2016-11-16 12:28:59 +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
|
94cbb73027
|
Merge branch 'fix-AideContact' into develop
|
2016-11-15 11:49:19 +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
|
40960bf54e
|
Merge branch 'fix-AideContact' into develop
|
2016-11-15 10:29:12 +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
|
40497ffb14
|
fix conflict
|
2016-11-14 14:20:50 +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
|
d8d9dcf9af
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 16:09:28 +01:00 |
|
Marion Muszynski
|
e34bef4bd2
|
small fix
|
2016-11-10 16:09:09 +01:00 |
|
Marion Muszynski
|
bf529276dd
|
Merge branch 'ticket-11211-MultiDeleteImg' into develop
|
2016-11-10 13:21:35 +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
|
fe03ca4ed1
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 10:36:37 +01:00 |
|
Marion Muszynski
|
ca38824e83
|
restriction on liston and listoff
|
2016-11-10 10:36:14 +01:00 |
|
Marion Muszynski
|
a9c19b6c6c
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-09 17:50:56 +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
|
d0f52b3070
|
Merge branch 'ticket-11557-FixLinkSaleCategory' into develop
|
2016-11-09 11:19:33 +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
|
ad9113aed1
|
Merge branch 'ticket-ChangeDeliveryAddress' into develop
|
2016-11-08 16:10:16 +01:00 |
|
Marion Muszynski
|
ec2694f052
|
addition of country restriction
|
2016-11-08 16:09:41 +01:00 |
|
Marion Muszynski
|
57e35ba7d8
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-08 14:59:21 +01:00 |
|
Marion Muszynski
|
ff7bed445b
|
Merge branch 'ticket-11557-FixLinkSaleCategory' into develop
|
2016-11-08 14:58:49 +01:00 |
|
Marion Muszynski
|
e88cab6df2
|
addition of module for many config
|
2016-11-08 14:58:29 +01:00 |
|
Marion Muszynski
|
6c69b6efa7
|
Merge branch 'ticket-11279-CategoryTestImport'
|
2016-11-08 13:13:20 +01:00 |
|
Marion Muszynski
|
c9dd7475bc
|
Merge branch 'ticket-11279-CategoryTestImport' into develop
|
2016-11-08 13:07:32 +01:00 |
|
Marion Muszynski
|
7d3c98f79f
|
addition of category checking
|
2016-11-08 13:07:15 +01:00 |
|
Marion Muszynski
|
b1a35c4885
|
Merge branch 'ticket-11513-newDelay'
|
2016-11-07 15:46:13 +01:00 |
|
Marion Muszynski
|
e996d5fcf6
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:43:51 +01:00 |
|
Marion Muszynski
|
57c1043e3a
|
small fix
|
2016-11-07 15:43:36 +01:00 |
|
Marion Muszynski
|
9b4f712659
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:42:14 +01:00 |
|
Marion Muszynski
|
962fac493e
|
fixin product tpl
|
2016-11-07 15:41:52 +01:00 |
|
Marion Muszynski
|
b4eaebddcf
|
fix vi bugs
|
2016-11-07 15:35:57 +01:00 |
|