 Rémi Gaillard
|
319ccf4e9e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-15 17:26:06 +01:00 |
|
|
Rémi Gaillard
|
804f88ec23
|
[-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops
|
2013-02-15 17:25:53 +01:00 |
|
|
vAugagneur
|
15f8b1a19f
|
//small fix
|
2013-02-15 17:06:16 +01:00 |
|
|
Rémi Gaillard
|
f6f1cb409a
|
[-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order
|
2013-02-15 16:24:46 +01:00 |
|
|
gRoussac
|
447ab05575
|
[-] FO : Fix warning #PSCFV-7805
|
2013-02-15 14:51:47 +01:00 |
|
|
Rémi Gaillard
|
4d4b0141f4
|
[-] Installer: fix upgrade __PS_BASE_URI__
|
2013-02-15 12:25:56 +01:00 |
|
|
vAugagneur
|
2dd6ef4f19
|
[-] CORE : fixed bug #PSCFV-6545 - ImageManager::resize() error
|
2013-02-15 12:13:13 +01:00 |
|
|
vAugagneur
|
838a360092
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-15 11:33:06 +01:00 |
|
|
vAugagneur
|
6a97bdbb7b
|
[-] BO : fixed bug #PSCFV-7551 - wrong breadcrumb when create root category
|
2013-02-15 11:33:00 +01:00 |
|
|
gRoussac
|
1e8fc6957c
|
[-] Installer : Fix warning during upgrade when issues with shops tables
|
2013-02-15 10:09:18 +01:00 |
|
|
Rémi Gaillard
|
40177dd4e3
|
// display image against standard error page for 404 on images
|
2013-02-14 16:44:50 +01:00 |
|
|
Rémi Gaillard
|
1ce97b8463
|
[-] FO: Fix categories and products restriction for unidentified customers after upgrade
|
2013-02-14 16:04:36 +01:00 |
|
|
Rémi Gaillard
|
d473c04ebe
|
[*] BO: store filter by category in admin products
|
2013-02-14 14:51:51 +01:00 |
|
|
Rémi Gaillard
|
749c627b38
|
// file missing
|
2013-02-14 11:09:11 +01:00 |
|
|
Damien Metzger
|
0e31de5b2f
|
[-] FO : deprecated free_shipping var set to "false"
|
2013-02-14 10:32:21 +01:00 |
|
|
Damien Metzger
|
f80b7abdfa
|
// Fixed warning and wrong cart rule total
|
2013-02-14 09:46:18 +01:00 |
|
|
Damien Metzger
|
2890e439b5
|
[*] BO : the option for accented URLs is now available in the backend
|
2013-02-14 09:15:01 +01:00 |
|
|
gRoussac
|
c7e87eb195
|
[-] CORE : Fix warning when result from query is not a ressource
|
2013-02-13 19:53:48 +01:00 |
|
|
Rémi Gaillard
|
ec7b47ba50
|
[-] Core: Fix rounding price computation with and without taxes #PSCFV-7796
|
2013-02-13 17:48:40 +01:00 |
|
|
Rémi Gaillard
|
67c0f98366
|
// something was missing
|
2013-02-13 16:17:10 +01:00 |
|
|
Rémi Gaillard
|
e3e38b19e1
|
[*] BO: you can now export listing of some tabs in CSV
|
2013-02-13 16:15:37 +01:00 |
|
|
Damien Metzger
|
cc1ff8ef0f
|
// htmlspecialchars on the sql queries in the profiling mode
|
2013-02-13 15:39:22 +01:00 |
|
|
Damien Metzger
|
7fc33eb01c
|
[-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785
|
2013-02-13 15:16:17 +01:00 |
|
|
Damien Metzger
|
ce9da19b49
|
// mod_filter is required with mod_deflate from apache 2.4
|
2013-02-13 14:46:34 +01:00 |
|
|
Damien Metzger
|
288021224c
|
// Moved html and js compression from global smarty config to front office smarty config
|
2013-02-13 14:38:43 +01:00 |
|
|
Rémi Gaillard
|
f9b3174b9c
|
[-] Core: upgrade smarty to 3.1.13
|
2013-02-13 14:30:45 +01:00 |
|
|
Rémi Gaillard
|
4b4b4b89f2
|
// small typo fix
|
2013-02-13 12:04:42 +01:00 |
|
|
Rémi Gaillard
|
8f5f202d60
|
// small fix
|
2013-02-13 11:32:02 +01:00 |
|
|
Rémi Gaillard
|
45fddec936
|
// List only module categories which contains at least 1 module
|
2013-02-13 11:26:18 +01:00 |
|
|
Gregory Roussac
|
981d3e8c97
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-13 11:04:49 +01:00 |
|
|
gRoussac
|
a0ab0cc444
|
[-] FO : Fix bug #PSCFV-7467 no email in post data
|
2013-02-13 11:03:59 +01:00 |
|
|
vAugagneur
|
dfb4aedbde
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-13 10:47:19 +01:00 |
|
|
gRoussac
|
787648f2c7
|
[*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome
|
2013-02-13 10:44:06 +01:00 |
|
|
gRoussac
|
718ae699ac
|
[-] FO : Fix Bug #PSCFV-7439 radio input css
|
2013-02-13 09:58:24 +01:00 |
|
|
vAugagneur
|
d6f5566e65
|
[+] BO : added new marketing tab
|
2013-02-13 09:57:30 +01:00 |
|
|
vAugagneur
|
aff0c2e965
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-13 09:51:24 +01:00 |
|
|
Gregory Roussac
|
8b2868d07b
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-12 16:40:56 +01:00 |
|
|
gRoussac
|
3e9d0dda55
|
[-] FO : Fix Bug #PSCFV-7339 available date on product page
|
2013-02-12 16:40:26 +01:00 |
|
|
gRoussac
|
51e458bccc
|
[-] FO : Fix Bug PSCFI-7016 available date on product page
|
2013-02-12 16:37:44 +01:00 |
|
|
vAugagneur
|
0ab55781ee
|
//remove modules_list.xml
|
2013-02-12 14:36:43 +01:00 |
|
|
Rémi Gaillard
|
ba3f3b88b5
|
// php notice
|
2013-02-12 12:06:09 +01:00 |
|
|
Damien Metzger
|
d007136149
|
[-] MO : applied unachieved patch on blockbestsellers
|
2013-02-12 12:03:17 +01:00 |
|
|
Rémi Gaillard
|
f5cf54ef3b
|
[*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload)
|
2013-02-12 11:35:10 +01:00 |
|
|
Rémi Gaillard
|
d6f21bd9f9
|
// small fix for change position
|
2013-02-12 10:46:48 +01:00 |
|
|
Rémi Gaillard
|
9709339084
|
// Fix SQL error
|
2013-02-11 18:45:00 +01:00 |
|
|
Rémi Gaillard
|
8348e28cac
|
[-] FO: Fix PHP warning on update quantity in cart with customizables products
|
2013-02-11 18:04:23 +01:00 |
|
|
Rémi Gaillard
|
61dbe6a2e2
|
Merge pull request #266 from anat/development
[+] WS : Add product bundle retrieval from Web services
|
2013-02-11 08:53:31 -08:00 |
|
|
anat
|
4990028dc2
|
[+] WS : Add product bundle retrieval from Web services
|
2013-02-11 17:51:18 +01:00 |
|
|
Rémi Gaillard
|
0ec4f02502
|
[-] FO: don't load medias if error on product page to avoid JS bugs
|
2013-02-11 17:33:19 +01:00 |
|
|
Rémi Gaillard
|
cc15bf0243
|
[-] FO: Fix Cart::getDeliveryOption() cache
|
2013-02-11 16:59:16 +01:00 |
|