 Francois Gaillard
|
978a4e05fa
|
[-] AdminTab header updated
|
2013-02-20 15:24:58 +01:00 |
|
|
Gregory Roussac
|
e389d1dd70
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-20 14:27:05 +01:00 |
|
|
gRoussac
|
30e1ef8cc1
|
[-] CORE : do not verify ssl certificate when using CURL
|
2013-02-20 14:26:16 +01:00 |
|
|
sLorenzini
|
755573184c
|
[-] BO: improve payment module page on IE
|
2013-02-20 11:35:50 +01:00 |
|
|
sLorenzini
|
ae9b78dc0f
|
[-] BO: improve module payment page
|
2013-02-20 11:08:20 +01:00 |
|
|
sLorenzini
|
4ce88468df
|
[-] BO: improve payment module page + header
|
2013-02-20 10:00:18 +01:00 |
|
|
Rémi Gaillard
|
3eeca3537a
|
// fix 2 links in admincustomers view
|
2013-02-19 16:38:52 +01:00 |
|
|
Rémi Gaillard
|
e152366d49
|
// small changes
|
2013-02-19 15:02:09 +01:00 |
|
|
Rémi Gaillard
|
9b85cb1f76
|
// delete useless commented code
|
2013-02-19 14:45:25 +01:00 |
|
|
Rémi Gaillard
|
51c6e2384f
|
[-] FO: Fix display specific prices for combinations in product page #PSCFV-7807
|
2013-02-18 20:30:53 +01:00 |
|
|
gRoussac
|
6a89fc4b0f
|
[-] CORE : Fix too big query for lastNoneOrderedCart
|
2013-02-18 17:44:09 +01:00 |
|
|
Damien Metzger
|
690d880cb7
|
[-] FO : Fixed regexp for images embbed in description
|
2013-02-18 16:17:05 +01:00 |
|
|
Damien Metzger
|
ad55093abb
|
// Fixed fatal error
|
2013-02-18 16:17:05 +01:00 |
|
|
Damien Metzger
|
27fced430f
|
// Added information
|
2013-02-18 16:17:04 +01:00 |
|
|
Rémi Gaillard
|
dd6a93d6f2
|
[-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context
|
2013-02-18 15:43:37 +01:00 |
|
|
Rémi Gaillard
|
96b86a79f3
|
[-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop
|
2013-02-18 15:29:48 +01:00 |
|
|
Rémi Gaillard
|
9b7c16ab9d
|
[-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795
|
2013-02-18 10:56:00 +01:00 |
|
|
Rémi Gaillard
|
c3dfe57036
|
[-] MO: regenerate the class_index after adding a new override
|
2013-02-15 18:41:06 +01:00 |
|
|
Rémi Gaillard
|
b23a7fe061
|
// Delete empty override files - use IO/s for nothing
|
2013-02-15 18:04:52 +01:00 |
|
|
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 |
|