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
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
39534bff4b
Merge branch 'ticket-9260' into develop
2016-08-30 14:03:42 +02:00
Marion Muszynski
719f438b41
fix
2016-08-30 14:03:19 +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
0fa7a8b036
Merge branch 'ticket-10758'
2016-08-30 10:54:58 +02:00
Marion Muszynski
46d2f45100
Merge branch 'ticket-10758' into develop
2016-08-30 10:54:32 +02:00
Marion Muszynski
ba0ad41bd5
ini set memory limit to 1G
2016-08-30 10:54:07 +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
b9ff9ead70
fix to loop the correct product array
2016-08-26 16:37:19 +02:00
Marion Muszynski
064072bfb8
modification to reprint label with multi products
2016-08-26 16:35:02 +02:00
Marion Muszynski
9e2007dfe8
adding re print label option
2016-08-26 12:00:54 +02:00
Marion Muszynski
1ed3c9df79
Merge branch 'ticket-9599'
2016-08-25 17:18:51 +02:00
Marion Muszynski
ecbce286f5
Merge branch 'ticket-9895'
2016-08-25 17:08:55 +02:00
Marion Muszynski
bcd33c882e
Merge branch 'ticket-9895' into develop
2016-08-25 17:04:47 +02:00
Marion Muszynski
78bc31c542
Merge branch 'ticket-9599' into develop
2016-08-25 17:02:31 +02:00
Marion Muszynski
fdc8a91a61
suite
2016-08-25 16:59:26 +02:00
Rodney Figaro
da3c1aeed5
fix admin product - now no redirection after changing an image
2016-08-25 16:49:16 +02:00
Rodney Figaro
6ec43fe75d
move the cron task to another dedicated file
2016-08-25 16:12:13 +02:00
Rodney Figaro
4ca5bc73a9
fix cron script
2016-08-25 15:20:38 +02:00
Rodney Figaro
7f18d590a0
add in private sales cron a sales promotional sentence update task
...
the "jusqu'à N%" of a sale promotional field is updated with
the maximum reduction percentage found for every product in the sale.
The cron affect only sales that begin the day when the cron is executed after midnight.
2016-08-25 15:16:44 +02:00
Marion Muszynski
35deb50531
Merge branch 'ticket-9728'
2016-08-25 13:05:58 +02:00
Marion Muszynski
d251c3f8d6
Merge branch 'ticket-9728' into develop
2016-08-25 13:01:37 +02:00
Marion Muszynski
cf8f32d6c1
Merge branch 'ticket-9895' into develop
2016-08-25 12:48:36 +02:00
Marion Muszynski
ed4df2bd73
continuing
2016-08-25 12:14:34 +02:00
Rodney Figaro
b82ca57e10
change single image upload to multiple images upload in admin > catalog edit product
2016-08-25 10:57:15 +02:00
Marion Muszynski
01ad5eb084
small fix
2016-08-24 17:48:50 +02:00
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
Marion Muszynski
1943181c4a
Merge branch 'evo-9386'
2016-08-24 14:27:36 +02:00
Marion Muszynski
4756a312ac
Merge branch 'evo-9386' into develop
2016-08-24 12:34:54 +02:00
Marion Muszynski
f91db79159
Merge branch 'fix-tplmobile'
2016-08-23 18:07:48 +02:00
