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 |
|
Marion Muszynski
|
fdf3fd43a8
|
Merge branch 'ticket-13016-Labelgenerate'
|
2017-04-13 14:12:18 +02:00 |
|
Marion Muszynski
|
32822dbe49
|
fix when order is not valid
|
2017-04-13 14:10:43 +02:00 |
|
Marion Muszynski
|
09c10685ca
|
Merge branch 'fix-generateEan'
|
2017-04-13 13:59:13 +02:00 |
|
Marion Muszynski
|
ada530274e
|
fix
|
2017-04-13 13:58:57 +02:00 |
|
Marion Muszynski
|
9490ea29b2
|
Merge branch 'ticket-13015-modifAdminSale'
|
2017-04-13 13:52:31 +02:00 |
|
Marion Muszynski
|
e89abbaee2
|
fix flag language
|
2017-04-13 13:51:04 +02:00 |
|
Marion Muszynski
|
33d778f823
|
Merge branch 'ticket-13015-modifAdminSale'
|
2017-04-13 13:03:48 +02:00 |
|
Marion Muszynski
|
d72262dd99
|
add override employee
|
2017-04-13 13:01:51 +02:00 |
|
Marion Muszynski
|
841b995299
|
clean admin ps
|
2017-04-13 12:55:09 +02:00 |
|
Marion Muszynski
|
346fc24f05
|
Merge branch 'Fix-CartCross'
|
2017-04-13 12:36:02 +02:00 |
|
Marion Muszynski
|
66b25a2e07
|
remove quantity delete from cart and blockcart
|
2017-04-13 12:12:46 +02:00 |
|
Marion Muszynski
|
43bb64da79
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-12 17:06:18 +02:00 |
|
Marion Muszynski
|
aad99bcea4
|
remove utm
|
2017-04-12 17:05:56 +02:00 |
|
Marion Muszynski
|
7b57050b5d
|
Merge branch 'fix-evoPrivateSale'
|
2017-04-12 09:53:11 +02:00 |
|
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 |
|