Marion Muszynski
|
47965cf5ed
|
fix go next
|
2017-08-17 16:03:52 +02:00 |
|
Christophe Latour
|
31517e2287
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-17 15:53:40 +02:00 |
|
Marion Muszynski
|
a5375c2a3d
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 15:53:22 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Christophe Latour
|
d8971432f4
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-17 15:26:34 +02:00 |
|
Marion Muszynski
|
9806fd20de
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-17 15:26:25 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Christophe Latour
|
7667036db8
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-17 11:25:45 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
61ae6d6fc1
|
Merge branch 'ticket-13745-modifMobileLogo'
|
2017-08-16 15:04:45 +02:00 |
|
Christophe Latour
|
09c3610800
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-16 15:03:49 +02:00 |
|
Marion Muszynski
|
5cc12c3b11
|
Merge branch 'ticket-13745-modifMobileLogo' into develop
|
2017-08-16 15:03:38 +02:00 |
|
Marion Muszynski
|
945db4ad17
|
change mobile logo according language
|
2017-08-16 15:03:23 +02:00 |
|
Christophe Latour
|
de1a8c235b
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-16 11:05:30 +02:00 |
|
Marion Muszynski
|
39b9fe9a8f
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-08-16 11:04:44 +02:00 |
|
Marion Muszynski
|
889259d031
|
fix async bug for saving gift message of cart
|
2017-08-16 11:04:23 +02:00 |
|
Christophe Latour
|
0d80af63d0
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-14 17:56:58 +02:00 |
|
Christophe Latour
|
cbc755b897
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-28 12:37:42 +02:00 |
|
Marion Muszynski
|
9f959444ce
|
Merge branch 'ticket-12743-SavSupplierPart2'
|
2017-07-28 12:37:22 +02:00 |
|
Marion Muszynski
|
ff96c35eeb
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:37:02 +02:00 |
|
Marion Muszynski
|
e6a7ab447d
|
add name of product in demand in adminOrder
|
2017-07-28 12:36:49 +02:00 |
|
Marion Muszynski
|
1685846768
|
Merge branch 'ticket-12743-SavSupplierPart2'
|
2017-07-28 12:19:02 +02:00 |
|
Christophe Latour
|
467867f10e
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-28 12:17:35 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
1412696156
|
addition of solution field for supplier demand
|
2017-07-28 12:16:24 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
root
|
74b797960e
|
fix legend from prod
|
2017-07-26 15:34:17 +02:00 |
|
Marion Muszynski
|
c1b06a0b4c
|
Merge branch 'ticket-13323-AdwordsES'
|
2017-07-26 13:34:18 +02:00 |
|
Christophe Latour
|
aea16ae489
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-26 13:22:09 +02:00 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
Marion Muszynski
|
58b3c509b4
|
prevent multi tracking after registration
|
2017-07-26 13:21:18 +02:00 |
|
Marion Muszynski
|
3525fdc711
|
Merge branch 'ticket-13775-PreventHacking'
|
2017-07-26 11:10:12 +02:00 |
|
Marion Muszynski
|
4acbde0319
|
add module alerthack to prevent hacker to post
|
2017-07-26 11:09:47 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
06338522e6
|
Merge branch 'ticket-12743-SavSupplier'
|
2017-07-24 16:56:15 +02:00 |
|
root
|
0316ebdc6b
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-24 12:01:16 +02:00 |
|
Marion Muszynski
|
c71a27df09
|
Merge branch 'ticket-13753-EvolBannerPromo'
|
2017-07-24 12:00:55 +02:00 |
|
root
|
14d7a30259
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-24 11:58:11 +02:00 |
|
Marion Muszynski
|
67aed06044
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:57:58 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
root
|
031ab5ec05
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-24 11:52:05 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
e19e7cfae3
|
Merge branch 'ticket-13755-LogStats'
|
2017-07-24 11:07:59 +02:00 |
|
Marion Muszynski
|
a9de174730
|
fix table width
|
2017-07-24 11:07:45 +02:00 |
|
Marion Muszynski
|
7d67a3b42e
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-24 10:21:04 +02:00 |
|
root
|
54db5800e0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-21 18:19:21 +02:00 |
|