Vincent Augagneur
|
a5be1f147f
|
//small fix when multi-store is enable on carrier wizard
|
2013-08-09 10:58:07 +02:00 |
|
Vincent Augagneur
|
1571dd60c8
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-09 10:44:24 +02:00 |
|
Vincent Augagneur
|
13be8db639
|
//added checkbox for all zones
|
2013-08-09 10:44:20 +02:00 |
|
Damien Metzger
|
cac7b267e6
|
[-] MO : fixed category link on blocklayered #PNM-1427
|
2013-08-09 10:37:23 +02:00 |
|
Damien Metzger
|
eed7ceb37a
|
[-] MO : blocklayered also try to find the translations in the translations directory
|
2013-08-09 10:21:37 +02:00 |
|
Jerome Nadaud
|
cbc7b9567a
|
[-] FO : Do not redirect on 301 when POST request
|
2013-08-09 10:20:42 +02:00 |
|
Damien Metzger
|
0fc1c9184c
|
[-] MO : added visibility IN ("both", "catalog") in blocklayered
|
2013-08-09 10:11:01 +02:00 |
|
Jerome Nadaud
|
64698d1590
|
[-] FO : FixBug generated_date error
|
2013-08-09 09:10:53 +02:00 |
|
Jérôme Nadaud
|
84ded9f3db
|
[-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country
|
2013-08-08 23:30:31 +02:00 |
|
Jérôme Nadaud
|
f5e28b9212
|
[-] FO : FixBug CGV does not pop-up in Fancy Box
|
2013-08-08 21:28:55 +02:00 |
|
gRoussac
|
9ccd9b7cad
|
[-] FO : Do not redirect on 301 when POST request
|
2013-08-08 19:19:34 +02:00 |
|
gRoussac
|
e923455f6d
|
// revert from 589052325b
|
2013-08-08 18:58:04 +02:00 |
|
Damien Metzger
|
50cba2b12b
|
// Added link to Addons in the footer
|
2013-08-08 17:49:17 +02:00 |
|
Damien Metzger
|
95680e0158
|
[*] FO : added chinese/japanese search
|
2013-08-08 16:58:07 +02:00 |
|
Jerome Nadaud
|
390b49122e
|
[-] FO : FixBug #PSCFV-10026 SSL error on ajax action
|
2013-08-08 15:58:52 +02:00 |
|
Rémi Gaillard
|
d2f41d7467
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-08 15:52:42 +02:00 |
|
Rémi Gaillard
|
589052325b
|
// Fix cart with ssl
|
2013-08-08 15:52:16 +02:00 |
|
Jerome Nadaud
|
be9398c6c5
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-08 13:06:41 +02:00 |
|
Jerome Nadaud
|
d5cdcab859
|
[-] MO : sendtofriend FixBug Form error
|
2013-08-08 13:06:18 +02:00 |
|
gRoussac
|
16fec55c6f
|
// report of 0023950c72
|
2013-08-08 12:16:19 +02:00 |
|
Gregory Roussac
|
49b6fda40f
|
Merge pull request #639 from PrestaEdit/patch-49
[-] BO: correct link in Block Discover.
|
2013-08-08 03:09:29 -07:00 |
|
Rémi Gaillard
|
cbdea59753
|
// revert 1c80b5fdfe
|
2013-08-08 11:50:35 +02:00 |
|
PrestaEdit
|
0023950c72
|
[-] BO: correct link in Block Discover.
|
2013-08-08 11:44:24 +02:00 |
|
Rémi Gaillard
|
5832ab3eb5
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-08 11:40:58 +02:00 |
|
Rémi Gaillard
|
567321dd3d
|
// clean cookie after logout
|
2013-08-08 11:39:36 +02:00 |
|
Damien Metzger
|
169c3fbc6b
|
// Removed useless line
|
2013-08-08 11:24:20 +02:00 |
|
Jerome Nadaud
|
7d4feac247
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-08 11:17:07 +02:00 |
|
Jerome Nadaud
|
8e72d122e6
|
[-] MO : blockcategories FixBug html tags in categories link title
|
2013-08-08 11:16:45 +02:00 |
|
gRoussac
|
5b3dda1cfb
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-08 11:05:37 +02:00 |
|
gRoussac
|
1c80b5fdfe
|
[-] BO : list of carriers should only contain the active one in AdminProducts
|
2013-08-08 11:05:09 +02:00 |
|
Damien Metzger
|
4709f4a3c0
|
[-] MO : fixed module upgrade with common version number
|
2013-08-08 11:03:22 +02:00 |
|
Gregory Roussac
|
bb45c93d4f
|
Merge pull request #563 from Prestaworks/patch-12
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
|
2013-08-08 02:00:57 -07:00 |
|
Damien Metzger
|
a9b44884f1
|
// Fixed upgrade of homeslider module
|
2013-08-08 10:47:03 +02:00 |
|
gRoussac
|
c31c2ca0e9
|
[-] MO: cover image issue with layered block on multishop, thanks @theginie
|
2013-08-08 10:46:22 +02:00 |
|
Jerome Nadaud
|
55fc51f20b
|
[-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error
|
2013-08-08 10:41:22 +02:00 |
|
gRoussac
|
1bfa43fa8b
|
[-] MO : My account column block should not display module icon in list
|
2013-08-08 10:38:39 +02:00 |
|
gRoussac
|
0f4562eb44
|
[*] MO : added manufactureres order by name, thanks@Jacky75
|
2013-08-08 10:24:05 +02:00 |
|
gRoussac
|
4abff03244
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-08 10:17:00 +02:00 |
|
gRoussac
|
d6ab0696e6
|
[-] BO : OrderSlip now correctly displays the order slip date, thanks @Jacky75
|
2013-08-08 10:16:41 +02:00 |
|
Damien Metzger
|
ff69638595
|
// removed kay navigation in carrier wizard
|
2013-08-08 09:38:52 +02:00 |
|
Damien Metzger
|
05946f2932
|
[-] MO : blocktopmenu should clear cache when adding a new subcategory
|
2013-08-08 09:35:19 +02:00 |
|
Damien Metzger
|
0550ad5135
|
// Fixed smarty parse error on live edit
|
2013-08-08 09:29:13 +02:00 |
|
gRoussac
|
f89e42a5c5
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-07 18:12:41 +02:00 |
|
gRoussac
|
601bfa628b
|
[-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept
|
2013-08-07 18:10:39 +02:00 |
|
Vincent Augagneur
|
73f40a6cc6
|
//fixed carrier wizard typewatch
|
2013-08-07 17:29:44 +02:00 |
|
gRoussac
|
a1786b97b3
|
[-] FO : expiration date not displayed in email for downloadable product
|
2013-08-07 17:08:50 +02:00 |
|
Jerome Nadaud
|
1c6eb93951
|
[-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it
|
2013-08-07 17:08:01 +02:00 |
|
Jerome Nadaud
|
44f7356d44
|
[-] BO : FixBug message charset problem in mail
|
2013-08-07 16:40:40 +02:00 |
|
Gregory Roussac
|
de3b121b11
|
Merge pull request #507 from jeckyl/patch-3
[*] BO : Fix size for modules logo AdminModulesPositions
|
2013-08-07 07:04:13 -07:00 |
|
Jerome Nadaud
|
239c5adb5a
|
[-] BO : FixBug smarty email variable override by blockcontact
|
2013-08-07 15:09:14 +02:00 |
|