Marion Muszynski
|
549cbfa145
|
Merge branch 'ticket-12392-fixItalianNumber'
|
2017-01-30 10:35:47 +01:00 |
|
Marion Muszynski
|
555895f753
|
fix es number checking
|
2017-01-30 10:35:32 +01:00 |
|
Marion Muszynski
|
58ad31a40d
|
Merge branch 'ticket-12392-fixItalianNumber'
|
2017-01-27 16:57:43 +01:00 |
|
Marion Muszynski
|
7ba5a2c7d0
|
fix es mobile error message
|
2017-01-27 16:57:27 +01:00 |
|
Marion Muszynski
|
047cc79226
|
Merge branch 'ticket-12392-fixItalianNumber'
|
2017-01-27 16:53:00 +01:00 |
|
Marion Muszynski
|
4714908ab4
|
fix phone number
|
2017-01-27 16:52:44 +01:00 |
|
Marion Muszynski
|
8a2af96f1e
|
update css labelgenerate before updating size of label
|
2017-01-27 15:16:30 +01:00 |
|
Marion Muszynski
|
6d4ccad85f
|
Merge branch 'update-helperform'
|
2017-01-27 13:18:45 +01:00 |
|
Marion Muszynski
|
e49326dd96
|
Merge branch 'update-helperform' into develop
|
2017-01-27 13:09:35 +01:00 |
|
Marion Muszynski
|
877fab90a7
|
fix conflicts
|
2017-01-27 13:09:02 +01:00 |
|
Marion Muszynski
|
c7e3f930c5
|
update helperform including lang managment
|
2017-01-27 13:04:48 +01:00 |
|
Marion Muszynski
|
3d5022241a
|
Merge branch 'ticket-12382-TwitterLink'
|
2017-01-27 11:34:19 +01:00 |
|
Marion Muszynski
|
15dff13eee
|
remove twitter link for es version
|
2017-01-27 11:33:28 +01:00 |
|
Marion Muszynski
|
bded5d1ae8
|
Merge branch 'ticket-12340-UpdateDeliveryPrice'
|
2017-01-27 10:46:51 +01:00 |
|
Marion Muszynski
|
14582e4e0f
|
change delay name of socol carriers when its delivered in Belgium
|
2017-01-27 10:45:48 +01:00 |
|
Marion Muszynski
|
14a00cb64a
|
Merge branch 'ticket-10580-FixBugWSU'
|
2017-01-26 17:03:50 +01:00 |
|
Marion Muszynski
|
163dec0625
|
big changement in wsu la poste, Monaco, Belgique, special char
|
2017-01-26 17:03:33 +01:00 |
|
Marion Muszynski
|
8204486942
|
update cron and mail conf_order
|
2017-01-26 15:32:22 +01:00 |
|
Marion Muszynski
|
3e11994e33
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-25 11:35:11 +01:00 |
|
Marion Muszynski
|
879b699d36
|
fix search in pltri
|
2017-01-25 11:34:52 +01:00 |
|
Marion Muszynski
|
f4dd25b002
|
Merge branch 'fix-soflexibilite'
|
2017-01-25 10:20:54 +01:00 |
|
Marion Muszynski
|
fa79488d36
|
Merge branch 'ticket-12215-showDelay'
|
2017-01-24 17:32:36 +01:00 |
|
Marion Muszynski
|
25fea84b8c
|
changement how to show sale delay
|
2017-01-24 17:32:22 +01:00 |
|
Marion Muszynski
|
f96e09e8b0
|
Merge branch 'fix-soflexibilite' into develop
|
2017-01-24 15:41:38 +01:00 |
|
Marion Muszynski
|
cb34675312
|
fix CMT when other countries than BE or FR
|
2017-01-24 15:41:19 +01:00 |
|
Marion Muszynski
|
846fc44bc3
|
Merge branch 'ticket-12340-UpdateDeliveryPrice'
|
2017-01-24 14:06:04 +01:00 |
|
Marion Muszynski
|
c17a23acf8
|
Merge branch 'ticket-12340-UpdateDeliveryPrice' into develop
|
2017-01-24 14:03:15 +01:00 |
|
Marion Muszynski
|
17ac2cc24c
|
addition of import/export for delivery prices in adminShipping
|
2017-01-24 14:02:45 +01:00 |
|
Marion Muszynski
|
1c36dc6731
|
fix conflicts
|
2017-01-24 12:35:45 +01:00 |
|
Marion Muszynski
|
9fe2c90d1c
|
revert changement
|
2017-01-24 12:34:44 +01:00 |
|
Marion Muszynski
|
e02f19c21b
|
fix conflict
|
2017-01-24 11:30:02 +01:00 |
|
Marion Muszynski
|
4eaa76f76a
|
hide relay select for widget socol
|
2017-01-24 11:27:47 +01:00 |
|
Marion Muszynski
|
8ae11e0adb
|
Merge branch 'ticket-12333-logModifScaddress'
|
2017-01-24 10:19:17 +01:00 |
|
Marion Muszynski
|
26d6feb522
|
aadition of log when employees update socol address
|
2017-01-24 10:19:01 +01:00 |
|
Marion Muszynski
|
ffaffefc08
|
Merge branch 'ticket-12200-FuturSalesInMenu'
|
2017-01-23 15:30:59 +01:00 |
|
Marion Muszynski
|
63a0b72670
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 15:11:06 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
eaf807cff3
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 11:28:51 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +01:00 |
|
Marion Muszynski
|
876417e78e
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-20 10:48:52 +01:00 |
|
Marion Muszynski
|
c4f2b99864
|
fix ajax for MR carrier name
|
2017-01-20 10:48:37 +01:00 |
|
Marion Muszynski
|
9beb6c978a
|
Merge branch 'ticket-12218-extractVP'
|
2017-01-20 09:43:29 +01:00 |
|
Marion Muszynski
|
2d7b50fbc5
|
moving column for sale extract
|
2017-01-20 09:42:39 +01:00 |
|
Marion Muszynski
|
9a37a9aa9c
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:56:24 +01:00 |
|
Marion Muszynski
|
84e9dc6d75
|
add xl and xxl mode in ajax logistic
|
2017-01-19 17:56:05 +01:00 |
|
Marion Muszynski
|
161a2dbc5b
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:53:17 +01:00 |
|
Marion Muszynski
|
d70e587997
|
fix renderlabel for 24* and lD* HOM
|
2017-01-19 17:52:56 +01:00 |
|
Marion Muszynski
|
d63be8f6ae
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:36:47 +01:00 |
|
Marion Muszynski
|
27a4d1e8cb
|
changement for dev and for dom carrier
|
2017-01-19 17:36:29 +01:00 |
|
Marion Muszynski
|
109132c0bf
|
Merge branch 'ticket-11199-RebuildNewsletter'
|
2017-01-19 16:03:03 +01:00 |
|