root
|
2d546243a4
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-04 11:54:15 +02:00 |
|
Marion Muszynski
|
cc7e420bed
|
Merge branch 'ticket-13010-ModifFraud2' into develop
|
2017-05-04 11:54:05 +02:00 |
|
Marion Muszynski
|
9d27f87e45
|
add test
|
2017-05-04 11:53:47 +02:00 |
|
root
|
e3e274a3c6
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-04 11:37:06 +02:00 |
|
Marion Muszynski
|
cf69aa347a
|
Merge branch 'ticket-13010-ModifFraud2' into develop
|
2017-05-04 11:36:24 +02:00 |
|
Marion Muszynski
|
f041619d2a
|
start of addition test in fraud module
|
2017-05-04 11:35:59 +02:00 |
|
Marion
|
0e41c41dc8
|
Merge branch 'ticket-13010-ModifFraud'
|
2017-05-03 15:49:10 +02:00 |
|
Marion
|
3235913d20
|
Merge branch 'ticket-13010-ModifFraud' into develop
|
2017-05-03 15:47:42 +02:00 |
|
Marion
|
082872a04c
|
modification when an order was in status 18
|
2017-05-03 15:43:20 +02:00 |
|
root
|
ece95c4c03
|
fix from prod
|
2017-05-02 14:39:14 +02:00 |
|
Marion Muszynski
|
706316a033
|
Merge branch 'fix-imgCat'
|
2017-05-02 12:37:24 +02:00 |
|
Marion Muszynski
|
173b417714
|
fix img vp en sliders
|
2017-05-02 12:37:11 +02:00 |
|
Marion Muszynski
|
d8d7a38883
|
Merge branch 'ticket-12962-LandingPage'
|
2017-05-02 11:30:36 +02:00 |
|
Marion Muszynski
|
f2a5d7ba75
|
fix trad
|
2017-05-02 11:30:22 +02:00 |
|
Marion Muszynski
|
c2fbfcf5b8
|
Merge branch 'ticket-12962-LandingPage'
|
2017-05-02 11:05:04 +02:00 |
|
root
|
1def42c6db
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-02 11:03:49 +02:00 |
|
Marion Muszynski
|
a5318730ef
|
Merge branch 'ticket-12962-LandingPage' into develop
|
2017-05-02 11:03:28 +02:00 |
|
Marion Muszynski
|
0dced8f385
|
redirect to authentication page for mobile navigation
|
2017-05-02 11:03:11 +02:00 |
|
root
|
095e986fcc
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-02 10:45:35 +02:00 |
|
Marion Muszynski
|
ccb22216a8
|
Merge branch 'ticket-12965-PreventRestokBraderie'
|
2017-05-02 10:44:56 +02:00 |
|
Marion Muszynski
|
8afad2627e
|
Merge branch 'ticket-12965-PreventRestokBraderie' into develop
|
2017-05-02 10:44:31 +02:00 |
|
Marion Muszynski
|
6b70af5e17
|
prevent restock when product is in braderie
|
2017-05-02 10:44:13 +02:00 |
|
root
|
8290c40e95
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-04-28 11:06:07 +02:00 |
|
Marion Muszynski
|
fa2db797b8
|
Merge branch 'ticket-12962-LandingPage' into develop
|
2017-04-28 11:05:31 +02:00 |
|
Marion Muszynski
|
de1c8e211e
|
addition of new landing page on home
|
2017-04-28 11:05:12 +02:00 |
|
root
|
6ac2cb948f
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-04-27 11:06:36 +02:00 |
|
Marion Muszynski
|
c9938dab53
|
Merge branch 'ticket-13148-FixImagePosition'
|
2017-04-27 11:06:26 +02:00 |
|
Marion Muszynski
|
e5bd73992e
|
Merge branch 'ticket-13148-FixImagePosition' into develop
|
2017-04-27 11:06:01 +02:00 |
|
Marion Muszynski
|
ee0b4e9fe6
|
fix image positions for export vp
|
2017-04-27 11:05:44 +02:00 |
|
Marion Muszynski
|
3d348727a2
|
Merge branch 'ticket-13133-NewFluxEmarsys'
|
2017-04-27 10:55:20 +02:00 |
|
Marion Muszynski
|
25cffa3a74
|
addition of statement for preheader and title if its tomorrow news
|
2017-04-27 10:55:06 +02:00 |
|
root
|
890c0bede4
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-04-27 10:35:36 +02:00 |
|
root
|
7dba99ca13
|
Merge branch 'mobile' into develop
|
2017-04-26 18:17:55 +02:00 |
|
Nolwenn
|
c33d9a9254
|
mobile suite
|
2017-04-26 17:15:51 +02:00 |
|
Marion Muszynski
|
c63c5aa5b5
|
Merge branch 'ticket-13133-NewFluxEmarsys'
|
2017-04-26 15:52:50 +02:00 |
|
Marion Muszynski
|
9b0bb24466
|
Merge branch 'ticket-13133-NewFluxEmarsys' into develop
|
2017-04-26 15:51:56 +02:00 |
|
Marion Muszynski
|
0a3c45ef95
|
addition of flux generation for tomorrow news
|
2017-04-26 15:51:12 +02:00 |
|
Nolwenn
|
ce5649b1f8
|
skin mobile home
|
2017-04-26 11:08:23 +02:00 |
|
Marion Muszynski
|
1fe47247e5
|
Merge branch 'ticket-12948-PrivatesaleNewsletter'
|
2017-04-25 16:51:13 +02:00 |
|
Marion Muszynski
|
7abf49d816
|
Merge branch 'ticket-12948-PrivatesaleNewsletter' into develop
|
2017-04-25 15:56:53 +02:00 |
|
Marion Muszynski
|
2641936fae
|
ticket-12948-PrivatesaleNewsletter
|
2017-04-25 15:56:28 +02:00 |
|
Marion Muszynski
|
434816c22c
|
Merge branch 'ticket-13128-BEphone'
|
2017-04-25 15:24:17 +02:00 |
|
Marion Muszynski
|
117053d905
|
fix message error phone BE
|
2017-04-25 15:24:04 +02:00 |
|
Marion Muszynski
|
980c6c0206
|
Merge branch 'ticket-13128-BEphone'
|
2017-04-25 15:16:41 +02:00 |
|
Marion Muszynski
|
8d994ebcf7
|
fix be phone soflexibilite
|
2017-04-25 15:16:27 +02:00 |
|
Marion Muszynski
|
32e22ff1ed
|
Merge branch 'ticket-12965-PreventRestock'
|
2017-04-25 15:05:51 +02:00 |
|
Marion Muszynski
|
f280695772
|
fix conflicts
|
2017-04-25 15:04:54 +02:00 |
|
Marion Muszynski
|
11790c0eff
|
prevent restockage when it s sent by philea
|
2017-04-25 15:03:41 +02:00 |
|
Marion Muszynski
|
373d0e3864
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-24 15:28:54 +02:00 |
|
Marion Muszynski
|
2fb6551fd9
|
Merge branch 'ticket-12487-HTTPS3' into develop
|
2017-04-24 15:28:28 +02:00 |
|