Marion Muszynski
|
389ba5467a
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-05 13:16:13 +02:00 |
|
Marion Muszynski
|
5670e21fa3
|
continuation of moving message gift to shipping cart
|
2017-07-05 13:15:51 +02:00 |
|
Marion Muszynski
|
e01ae068ca
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:25:04 +02:00 |
|
Marion Muszynski
|
2b6528ad72
|
fix module id and name
|
2017-07-05 11:24:53 +02:00 |
|
Marion Muszynski
|
73dbe5691f
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:18:22 +02:00 |
|
Marion Muszynski
|
900848524b
|
add hash and time to paybox call
|
2017-07-05 11:18:09 +02:00 |
|
Marion Muszynski
|
eb39bdc47b
|
fix conflict
|
2017-07-05 11:07:43 +02:00 |
|
Marion Muszynski
|
e3b75ce760
|
fix pbx langue
|
2017-07-05 11:00:45 +02:00 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
Marion Muszynski
|
4435110d9d
|
little fix
|
2017-07-04 16:04:00 +02:00 |
|
Marion Muszynski
|
bede4db028
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-07-04 15:54:26 +02:00 |
|
Marion Muszynski
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
root
|
383d48726c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-07-04 15:32:36 +02:00 |
|
root
|
dd218bb37a
|
push from prod
|
2017-07-04 15:32:17 +02:00 |
|
Marion Muszynski
|
0e9d19a20f
|
Merge branch 'ticket-11985-CarrierSelection'
|
2017-07-04 15:29:42 +02:00 |
|
Marion Muszynski
|
72965b110b
|
add auto carrier selection
|
2017-07-04 15:29:26 +02:00 |
|
Marion Muszynski
|
84e306d811
|
Merge branch 'ticket-12803-ModifSimilarProduct'
|
2017-07-04 15:02:39 +02:00 |
|
Marion Muszynski
|
e742880efe
|
Merge branch 'ticket-12803-ModifSimilarProduct' into develop
:q
|
2017-07-04 10:57:44 +02:00 |
|
Marion Muszynski
|
18da9c8c75
|
change image size
|
2017-07-04 10:57:31 +02:00 |
|
Marion Muszynski
|
bc3b1c13fa
|
Merge branch 'ticket-12803-ModifSimilarProduct' into develop
|
2017-07-04 10:46:23 +02:00 |
|
Marion Muszynski
|
d726131b76
|
css modification of similar product
|
2017-07-04 10:46:06 +02:00 |
|
Marion Muszynski
|
eef4d0f4b9
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-03 10:15:38 +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
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +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
|
45fbaac030
|
Merge branch 'ticket-13166-RetourProcess_3' into develop
|
2017-06-26 11:53:16 +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
|
d1ef2e6fe7
|
Merge branch 'ticket-13166-upgradeReturnPart2' into develop
|
2017-06-23 12:25:12 +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 |
|