Marion Muszynski
|
8d8c46d7b6
|
fix adminPrivateSaleSales
|
2017-04-12 09:52:43 +02:00 |
|
Marion Muszynski
|
c746cadfda
|
fix conflict
|
2017-04-11 15:28:59 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
root
|
95a3814d25
|
fix conflicts
|
2017-04-11 13:15:56 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
fa19b8800d
|
Merge branch 'fix-antConfig'
|
2017-04-11 12:33:15 +02:00 |
|
Marion Muszynski
|
83599a72e6
|
fix
|
2017-04-11 12:32:58 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
099ea1339b
|
Merge branch 'fix-customerThread'
|
2017-04-10 17:05:15 +02:00 |
|
Marion Muszynski
|
dac13d6486
|
fix when no customer but visitor
|
2017-04-10 17:05:01 +02:00 |
|
Marion Muszynski
|
c47fd515e4
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-10 16:33:56 +02:00 |
|
Marion Muszynski
|
d6e3e16a51
|
modif rss flux catalogue
|
2017-04-10 16:33:42 +02:00 |
|
Marion Muszynski
|
d8515e1fca
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-10 16:31:37 +02:00 |
|
Marion Muszynski
|
400feb54e1
|
modification flux catalogue to https
|
2017-04-10 16:31:20 +02:00 |
|
Marion Muszynski
|
c7facde1f8
|
fix
|
2017-04-07 12:21:21 +02:00 |
|
Marion Muszynski
|
7d9b3dfcd7
|
fix for https
|
2017-04-07 11:47:42 +02:00 |
|
Marion Muszynski
|
e47ce38651
|
Merge branch 'ticket-12957-BugCustoms'
|
2017-04-07 11:19:44 +02:00 |
|
Marion Muszynski
|
4aafc8ca10
|
fix
|
2017-04-07 11:18:57 +02:00 |
|
Marion Muszynski
|
17f451e8a7
|
Merge branch 'ticket-12957-BugCustoms'
|
2017-04-07 10:31:41 +02:00 |
|
Marion Muszynski
|
83bd4d15c3
|
fix insert product customs
|
2017-04-07 10:22:21 +02:00 |
|
Marion Muszynski
|
89f72c7045
|
Merge branch 'ticket-12462-returnMR'
|
2017-04-06 16:24:22 +02:00 |
|
Marion Muszynski
|
d94a6b07a5
|
Merge branch 'ticket-12452-SAVMessHistory'
|
2017-04-06 16:22:22 +02:00 |
|
Marion Muszynski
|
db3f82675d
|
fix color
|
2017-04-06 16:18:12 +02:00 |
|
Marion Muszynski
|
2b861808e0
|
addition of conversation history in customer thread
|
2017-04-06 16:10:25 +02:00 |
|
Marion Muszynski
|
20a07e3273
|
Merge branch 'ticket-12754-MailAlert'
|
2017-04-03 14:22:24 +02:00 |
|
Marion Muszynski
|
13a6f8a4ed
|
Merge branch 'ticket-12487-HTTPS2'
|
2017-04-03 12:53:03 +02:00 |
|
Marion Muszynski
|
028fb3b087
|
http to https for newsletter
|
2017-04-03 12:52:49 +02:00 |
|
Marion Muszynski
|
b7f52f26ef
|
addition of mail sending to contact@bebeboutik.com
|
2017-04-03 10:43:38 +02:00 |
|
Marion Muszynski
|
aefba6f752
|
fix mail sending when no discount added
|
2017-03-31 10:05:50 +02:00 |
|
Marion Muszynski
|
21ca232a11
|
addition of order status option in mail alert module
|
2017-03-30 12:10:32 +02:00 |
|
Marion Muszynski
|
dcba09e9c9
|
Merge branch 'ticket-12857-addInfoProduct'
|
2017-03-29 15:01:32 +02:00 |
|
Marion Muszynski
|
82e2916c8a
|
fix balise p tpl product
|
2017-03-29 15:01:17 +02:00 |
|
Marion Muszynski
|
dce18889d5
|
Merge branch 'ticket-12857-addInfoProduct'
|
2017-03-29 12:03:01 +02:00 |
|
Marion Muszynski
|
b585f50621
|
addition of info sentence in product tpl
|
2017-03-29 11:37:34 +02:00 |
|
Marion Muszynski
|
dc9ec01fce
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 11:01:56 +02:00 |
|
Marion Muszynski
|
82a396a094
|
remove presta cache system for bestseller
|
2017-03-29 10:55:52 +02:00 |
|
Marion Muszynski
|
bc8a76bb3d
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart'
|
2017-03-29 10:22:01 +02:00 |
|
Marion Muszynski
|
d060194a88
|
resize sub and add img
|
2017-03-29 10:20:00 +02:00 |
|
Marion Muszynski
|
eedf8a37cf
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 10:11:47 +02:00 |
|
Marion Muszynski
|
85ca91ccfc
|
remove presta cache system for similar products
|
2017-03-29 10:07:59 +02:00 |
|
Marion Muszynski
|
79b2174ae3
|
Merge branch 'ticket-12742-AntCreationCat'
|
2017-03-28 10:33:56 +02:00 |
|
Marion Muszynski
|
d9f183aacb
|
fix add to cart combination id
|
2017-03-28 10:28:57 +02:00 |
|
Marion Muszynski
|
dafc4e16f0
|
fix remove from block cart
|
2017-03-28 10:09:35 +02:00 |
|
Marion Muszynski
|
f886f5c02e
|
fix
|
2017-03-27 18:10:05 +02:00 |
|
Marion Muszynski
|
36147fbf40
|
change to add , in category names
|
2017-03-27 18:03:30 +02:00 |
|
Marion Muszynski
|
5ff3f45264
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 16:06:10 +02:00 |
|
Marion Muszynski
|
11fc4769b6
|
fix fatal
|
2017-03-27 16:05:55 +02:00 |
|
Marion Muszynski
|
f7e7d832c4
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 13:24:48 +02:00 |
|
Marion Muszynski
|
49cc2ef838
|
addition clean menu on category creation and updating
|
2017-03-27 13:24:03 +02:00 |
|
Marion Muszynski
|
20442f61db
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 13:13:51 +02:00 |
|