Marion
|
0e41c41dc8
|
Merge branch 'ticket-13010-ModifFraud'
|
2017-05-03 15:49:10 +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 |
|
Marion Muszynski
|
0dced8f385
|
redirect to authentication page for mobile navigation
|
2017-05-02 11:03:11 +02:00 |
|
Marion Muszynski
|
ccb22216a8
|
Merge branch 'ticket-12965-PreventRestokBraderie'
|
2017-05-02 10:44:56 +02:00 |
|
Marion Muszynski
|
6b70af5e17
|
prevent restock when product is in braderie
|
2017-05-02 10:44:13 +02:00 |
|
Marion Muszynski
|
de1c8e211e
|
addition of new landing page on home
|
2017-04-28 11:05:12 +02:00 |
|
Nolwenn
|
0d7c20c9d2
|
fixs
|
2017-04-27 17:00:47 +02:00 |
|
Nolwenn
|
b27f9ef4c3
|
mobile suite
|
2017-04-27 14:24:48 +02:00 |
|
Marion Muszynski
|
c9938dab53
|
Merge branch 'ticket-13148-FixImagePosition'
|
2017-04-27 11:06:26 +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 |
|
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
|
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
|
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
|
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
|
463cbb7ebb
|
replace http to // for every descriptions
|
2017-04-24 15:28:08 +02:00 |
|
Marion Muszynski
|
3894ee9acd
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-24 15:21:42 +02:00 |
|
Marion Muszynski
|
d3a23e7f90
|
add str replace for img in descriptions
|
2017-04-24 15:20:41 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
11516eca14
|
Merge branch 'ticket-13032'
|
2017-04-24 11:18:27 +02:00 |
|
Marion Muszynski
|
9e5f7df11b
|
Merge branch 'ticket-12455-SAVjoinFile'
|
2017-04-21 13:52:39 +02:00 |
|
Marion Muszynski
|
6b7d57bb43
|
show join file
|
2017-04-21 13:51:47 +02:00 |
|
Marion Muszynski
|
72a2a1f74f
|
save file name in db for mess
|
2017-04-21 13:07:45 +02:00 |
|
Marion Muszynski
|
2db650855b
|
Merge branch 'ticket-12827-BugFilterProductList'
|
2017-04-20 10:51:28 +02:00 |
|
Marion Muszynski
|
2d5c17ac1e
|
cleaning before merge
|
2017-04-20 10:50:15 +02:00 |
|
Marion Muszynski
|
a7394fdc93
|
fix bug when product is not found from filter options
|
2017-04-20 10:48:53 +02:00 |
|
Marion Muszynski
|
9f6a5b3529
|
Merge branch 'ticket-12958-FilterVp'
|
2017-04-20 09:51:35 +02:00 |
|
Marion Muszynski
|
32e7d65395
|
fix block filter on scroll category
|
2017-04-20 09:47:13 +02:00 |
|
Marion Muszynski
|
525a31b490
|
Merge branch 'ticket-12801-CarrierCleaning'
|
2017-04-19 12:41:57 +02:00 |
|
Marion Muszynski
|
2bbc6d5fa6
|
addition of carrier filter for active ones
|
2017-04-19 12:36:41 +02:00 |
|
Marion Muszynski
|
7ef211bbf7
|
addition of another if statement to match eans with first 0
|
2017-04-18 17:01:00 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
5d10aa4c72
|
Merge branch 'ticket-13014-ReplyEs'
|
2017-04-13 14:25:01 +02:00 |
|
Marion Muszynski
|
d017974d15
|
fix link reply
|
2017-04-13 14:24:42 +02:00 |
|