Marion Muszynski
|
b4ff3a8ee5
|
addition of remove img option in adminPrivateSalesSales
|
2016-09-06 11:07:40 +02:00 |
|
Marion Muszynski
|
2d10e1b167
|
Merge branch 'ticket-9260'
|
2016-09-05 16:52:19 +02:00 |
|
Marion Muszynski
|
797a27cea3
|
Merge branch 'ticket-9260' into develop
|
2016-09-05 16:22:59 +02:00 |
|
Marion Muszynski
|
50e0bc4c79
|
modification to find the right category thumb in productController
|
2016-09-05 16:22:28 +02:00 |
|
Marion Muszynski
|
b6dc54c290
|
addition html2text for emarsys and vp description
|
2016-09-05 15:45:05 +02:00 |
|
Marion Muszynski
|
6f357a68ab
|
Merge branch 'ticket-9260' into develop
|
2016-09-05 11:58:03 +02:00 |
|
Marion Muszynski
|
17eda01760
|
modif for children cat
|
2016-09-05 11:57:43 +02:00 |
|
Marion Muszynski
|
13e85738e6
|
Merge branch 'ticket-9260'
|
2016-09-05 10:37:24 +02:00 |
|
Marion Muszynski
|
3389d9d3ad
|
fix conflict
|
2016-09-05 10:26:06 +02:00 |
|
Marion Muszynski
|
3d685e10b4
|
fix addition
|
2016-09-05 10:24:21 +02:00 |
|
Marion Muszynski
|
411a95e56b
|
Merge branch 'ticket-9260' into develop
|
2016-09-02 12:04:31 +02:00 |
|
Marion Muszynski
|
930b874822
|
fix for sub cat thumb
|
2016-09-02 12:04:10 +02:00 |
|
Marion Muszynski
|
84c83241a8
|
Merge branch 'fix-10796'
|
2016-09-02 11:29:50 +02:00 |
|
Marion Muszynski
|
fb0cf0f757
|
Merge branch 'fix-10796' into develop
|
2016-09-02 11:23:34 +02:00 |
|
Rodney Figaro
|
d06391d181
|
fix bug when submitting a product form with no new image added (BO)
|
2016-09-02 10:49:34 +02:00 |
|
Marion Muszynski
|
b9ff92a5d2
|
Merge branch 'fix-ticket-10169'
|
2016-09-01 11:18:36 +02:00 |
|
Marion Muszynski
|
90a847db2b
|
Merge branch 'fix-ticket-10169' into develop
|
2016-09-01 11:18:03 +02:00 |
|
Marion Muszynski
|
31bb7e145b
|
fix form reprint
|
2016-09-01 11:17:43 +02:00 |
|
Marion Muszynski
|
8e309f060f
|
Merge branch 'ticket-10169'
|
2016-08-31 16:26:35 +02:00 |
|
Marion Muszynski
|
51f7b39a4d
|
Merge branch 'ticket-10169' into develop
|
2016-08-31 16:26:10 +02:00 |
|
Marion Muszynski
|
ad26e64ad0
|
fix weight
|
2016-08-31 16:25:49 +02:00 |
|
Marion Muszynski
|
639b7111e6
|
Merge branch 'ticket-10169'
|
2016-08-31 15:58:44 +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
|
c12d1535ff
|
Merge branch 'ticket-10169' into develop
|
2016-08-31 15:22:54 +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
|
bf0681a105
|
Merge branch 'fix-9890'
|
2016-08-31 15:05:20 +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
|
143e2faa72
|
Merge branch 'ticket-10527'
|
2016-08-31 14:58:30 +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
|
1fdec1c945
|
Merge branch 'ticket-9260' into develop
|
2016-08-31 12:41:31 +02:00 |
|
Marion Muszynski
|
0c7aefe613
|
fix to get sub cat thumb
|
2016-08-31 12:41:07 +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
|
857c4a6f78
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2016-08-31 11:56:52 +02:00 |
|
Marion Muszynski
|
11df31d8bd
|
Merge branch 'ticket_9890'
|
2016-08-31 11:56:22 +02:00 |
|
Marion Muszynski
|
20640ba5ae
|
Merge branch 'ticket_9890' into develop
|
2016-08-31 11:55:38 +02:00 |
|
Marion Muszynski
|
ff0d7651bf
|
fix total product attribute quantities
|
2016-08-31 11:55:14 +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 |
|