Marion Muszynski
|
9e8c06d808
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:14:15 +02:00 |
|
Marion Muszynski
|
1b444a773f
|
css modif
|
2016-09-09 13:13:57 +02:00 |
|
Marion Muszynski
|
410ddb43b1
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:10:00 +02:00 |
|
Marion Muszynski
|
3d325dbc7c
|
small modif
|
2016-09-09 13:09:43 +02:00 |
|
Marion Muszynski
|
3c7e15e2c3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:07:18 +02:00 |
|
Marion Muszynski
|
8074d6f063
|
modif css manage payments
|
2016-09-09 13:07:01 +02:00 |
|
Marion Muszynski
|
40457d1935
|
Merge branch 'ticket-10296' into develop
|
2016-09-07 08:58:24 +02:00 |
|
Marion Muszynski
|
b6dc54c290
|
addition html2text for emarsys and vp description
|
2016-09-05 15:45:05 +02:00 |
|
Marion Muszynski
|
13e85738e6
|
Merge branch 'ticket-9260'
|
2016-09-05 10:37:24 +02:00 |
|
Marion Muszynski
|
c9bdecd1d4
|
Merge branch 'ticket-9260' into develop
|
2016-08-31 15:35:29 +02:00 |
|
Marion Muszynski
|
5a8d3eb781
|
small fix
|
2016-08-31 15:35:09 +02:00 |
|
Marion Muszynski
|
b677946ca7
|
Merge branch 'ticket-10527'
|
2016-08-31 15:18:42 +02:00 |
|
Marion Muszynski
|
0221ccb2e7
|
Merge branch 'ticket-10527' into develop
|
2016-08-31 15:17:41 +02:00 |
|
Marion Muszynski
|
144733299c
|
up reassurance sentence at first place
|
2016-08-31 15:17:21 +02:00 |
|
Marion Muszynski
|
b809ee0c26
|
Merge branch 'fix-9890' into develop
|
2016-08-31 15:03:31 +02:00 |
|
Marion Muszynski
|
6ff4e35f7b
|
fix css
|
2016-08-31 15:03:11 +02:00 |
|
Marion Muszynski
|
72a0d2d3d7
|
Merge branch 'ticket-10527' into develop
|
2016-08-31 14:57:19 +02:00 |
|
Marion Muszynski
|
5c35c6431b
|
fix
|
2016-08-31 14:56:59 +02:00 |
|
Marion Muszynski
|
e0c4e0dfe6
|
Merge branch 'ticket-10527' into develop
|
2016-08-31 14:55:15 +02:00 |
|
Marion Muszynski
|
abdbb008b5
|
adding reassurance sentences in payment step
|
2016-08-31 14:54:30 +02:00 |
|
Marion Muszynski
|
742a8d1ca9
|
fix conflicts
|
2016-08-31 13:36:10 +02:00 |
|
Marion Muszynski
|
2dd1baef49
|
adding reassurance sentences for es
|
2016-08-31 13:32:59 +02:00 |
|
Marion Muszynski
|
afde5b69a7
|
Merge branch 'ticket_9890'
|
2016-08-31 12:19:57 +02:00 |
|
Marion Muszynski
|
1046fd27f2
|
Merge branch 'ticket_9890' into develop
|
2016-08-31 12:18:37 +02:00 |
|
Marion Muszynski
|
40c9fb6bff
|
fix
|
2016-08-31 12:18:17 +02:00 |
|
root
|
a2d5ed0a14
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2016-08-31 11:09:42 +02:00 |
|
root
|
163411b776
|
modif trad
|
2016-08-31 11:08:56 +02:00 |
|
Marion Muszynski
|
bb5ff6ba97
|
fix conflicts
|
2016-08-31 11:04:16 +02:00 |
|
Marion Muszynski
|
c164e03c24
|
fix conflict
|
2016-08-31 10:37:12 +02:00 |
|
Marion Muszynski
|
8db5762b5b
|
modif css mobile
|
2016-08-31 10:35:33 +02:00 |
|
Marion Muszynski
|
563b9059de
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:56:13 +02:00 |
|
Marion Muszynski
|
0dde6b5611
|
fix for old sales
|
2016-08-30 13:55:47 +02:00 |
|
Marion Muszynski
|
e2c867f5ed
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:48:00 +02:00 |
|
Marion Muszynski
|
a96b0018c0
|
upload vp miniature in adminCategory
|
2016-08-30 13:47:42 +02:00 |
|
Marion Muszynski
|
93e464c78b
|
Merge branch 'ticket_9890' into develop
|
2016-08-26 17:16:42 +02:00 |
|
Marion Muszynski
|
0f85417eaf
|
modif css
|
2016-08-26 17:16:18 +02:00 |
|
Marion Muszynski
|
c45e018298
|
Merge branch 'ticket_9890' into develop
|
2016-08-26 17:08:53 +02:00 |
|
Marion Muszynski
|
bab94ab68b
|
fix and modif css
|
2016-08-26 17:08:28 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +02:00 |
|
Marion Muszynski
|
63ee2fb3c9
|
fix tpl product add to cart
|
2016-08-23 18:07:24 +02:00 |
|
Marion Muszynski
|
b963f91154
|
Merge branch 'evo-10581'
|
2016-08-23 15:22:25 +02:00 |
|
Marion Muszynski
|
343fc553aa
|
modif for prod
|
2016-08-23 15:21:43 +02:00 |
|
Marion Muszynski
|
cafdba6107
|
Merge branch 'ticket-8039'
|
2016-08-23 14:53:45 +02:00 |
|
Marion Muszynski
|
01e7bedfe9
|
small fix
|
2016-08-23 14:53:24 +02:00 |
|
Marion Muszynski
|
e5dbd10cef
|
Merge branch 'ticket-8039'
|
2016-08-23 14:50:53 +02:00 |
|
Marion Muszynski
|
52e59458d5
|
petit fix
|
2016-08-23 14:50:30 +02:00 |
|
Marion Muszynski
|
b3e04efabe
|
Merge branch 'evo-10581' into develop
|
2016-08-23 12:32:54 +02:00 |
|
Marion Muszynski
|
e02097858b
|
fix css conflicts
|
2016-08-23 12:31:28 +02:00 |
|
Rodney Figaro
|
b335e6adf1
|
fix original text in product info size in french rather than in spanish
|
2016-08-23 12:17:56 +02:00 |
|
Rodney Figaro
|
b95db0bb8c
|
change css of the size info popup for mobile version
|
2016-08-23 12:06:39 +02:00 |
|