 Rémi Gaillard
|
3fd12ef9bd
|
[-] Installer: fix UNIQUE key on stock_available table #PSCFV-7886
|
2013-02-20 16:12:39 +01:00 |
|
|
Damien Metzger
|
9f2c5e5100
|
// Update default class_index
|
2013-02-20 15:58:02 +01:00 |
|
|
Rémi Gaillard
|
dfa1804dfb
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-20 15:29:21 +01:00 |
|
|
Rémi Gaillard
|
95c090ccec
|
// small fix
|
2013-02-20 15:28:54 +01:00 |
|
|
François Gaillard
|
a236224da0
|
[-] AdminTab header updated
|
2013-02-20 15:24:58 +01:00 |
|
|
Gregory Roussac
|
ba3a9de6df
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-20 14:27:05 +01:00 |
|
|
gRoussac
|
477b0f8b1c
|
[-] CORE : do not verify ssl certificate when using CURL
|
2013-02-20 14:26:16 +01:00 |
|
|
sLorenzini
|
3f22df2cfb
|
[-] BO: improve payment module page on IE
|
2013-02-20 11:35:50 +01:00 |
|
|
sLorenzini
|
602c11079d
|
[-] BO: improve module payment page
|
2013-02-20 11:08:20 +01:00 |
|
|
sLorenzini
|
110afe7b69
|
[-] BO: improve payment module page + header
|
2013-02-20 10:00:18 +01:00 |
|
|
Rémi Gaillard
|
702679a3a0
|
// fix 2 links in admincustomers view
|
2013-02-19 16:38:52 +01:00 |
|
|
Rémi Gaillard
|
7e6728b342
|
// small changes
|
2013-02-19 15:02:09 +01:00 |
|
|
Rémi Gaillard
|
23733e0158
|
// delete useless commented code
|
2013-02-19 14:45:25 +01:00 |
|
|
Rémi Gaillard
|
379381a5aa
|
[-] FO: Fix display specific prices for combinations in product page #PSCFV-7807
|
2013-02-18 20:30:53 +01:00 |
|
|
gRoussac
|
3b4978af36
|
[-] CORE : Fix too big query for lastNoneOrderedCart
|
2013-02-18 17:44:09 +01:00 |
|
|
Damien Metzger
|
28e8653e9c
|
[-] FO : Fixed regexp for images embbed in description
|
2013-02-18 16:17:05 +01:00 |
|
|
Damien Metzger
|
d811f74d6c
|
// Fixed fatal error
|
2013-02-18 16:17:05 +01:00 |
|
|
Damien Metzger
|
4479aa7c41
|
// Added information
|
2013-02-18 16:17:04 +01:00 |
|
|
Rémi Gaillard
|
7c26ea32e7
|
[-] 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
|
08f5a01bd8
|
[-] 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
|
8ab6c87df0
|
[-] 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
|
f593ec5b8a
|
[-] MO: regenerate the class_index after adding a new override
|
2013-02-15 18:41:06 +01:00 |
|
|
Rémi Gaillard
|
0cd1033527
|
// Delete empty override files - use IO/s for nothing
|
2013-02-15 18:04:52 +01:00 |
|
|
Rémi Gaillard
|
d46868020f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-15 17:26:06 +01:00 |
|
|
Rémi Gaillard
|
4da97fe62e
|
[-] 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
|
6ade01adaa
|
//small fix
|
2013-02-15 17:06:16 +01:00 |
|
|
Rémi Gaillard
|
36c23c54cc
|
[-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order
|
2013-02-15 16:24:46 +01:00 |
|
|
gRoussac
|
1db843334a
|
[-] FO : Fix warning #PSCFV-7805
|
2013-02-15 14:51:47 +01:00 |
|
|
Rémi Gaillard
|
56d8dcdef0
|
[-] Installer: fix upgrade __PS_BASE_URI__
|
2013-02-15 12:25:56 +01:00 |
|
|
vAugagneur
|
88a8140c59
|
[-] CORE : fixed bug #PSCFV-6545 - ImageManager::resize() error
|
2013-02-15 12:13:13 +01:00 |
|
|
vAugagneur
|
70f4142fbd
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-02-15 11:33:06 +01:00 |
|
|
vAugagneur
|
505bea4cef
|
[-] BO : fixed bug #PSCFV-7551 - wrong breadcrumb when create root category
|
2013-02-15 11:33:00 +01:00 |
|
|
gRoussac
|
4f0b5307a4
|
[-] Installer : Fix warning during upgrade when issues with shops tables
|
2013-02-15 10:09:18 +01:00 |
|
|
Rémi Gaillard
|
ee9e0b6380
|
// display image against standard error page for 404 on images
|
2013-02-14 16:44:50 +01:00 |
|
|
Rémi Gaillard
|
05a64b9d66
|
[-] FO: Fix categories and products restriction for unidentified customers after upgrade
|
2013-02-14 16:04:36 +01:00 |
|
|
Rémi Gaillard
|
f137de9613
|
[*] BO: store filter by category in admin products
|
2013-02-14 14:51:51 +01:00 |
|
|
Rémi Gaillard
|
71d6a67de9
|
// file missing
|
2013-02-14 11:09:11 +01:00 |
|
|
Damien Metzger
|
f4f6055bc3
|
[-] FO : deprecated free_shipping var set to "false"
|
2013-02-14 10:32:21 +01:00 |
|
|
Damien Metzger
|
2d0f54e0ee
|
// Fixed warning and wrong cart rule total
|
2013-02-14 09:46:18 +01:00 |
|
|
Damien Metzger
|
849c2da9eb
|
[*] BO : the option for accented URLs is now available in the backend
|
2013-02-14 09:15:01 +01:00 |
|
|
gRoussac
|
876b4c09bc
|
[-] CORE : Fix warning when result from query is not a ressource
|
2013-02-13 19:53:48 +01:00 |
|
|
Rémi Gaillard
|
7402d7b93d
|
[-] Core: Fix rounding price computation with and without taxes #PSCFV-7796
|
2013-02-13 17:48:40 +01:00 |
|
|
Rémi Gaillard
|
2c2f4170bb
|
// something was missing
|
2013-02-13 16:17:10 +01:00 |
|
|
Rémi Gaillard
|
9dcb75e572
|
[*] BO: you can now export listing of some tabs in CSV
|
2013-02-13 16:15:37 +01:00 |
|
|
Damien Metzger
|
725a3f9759
|
// htmlspecialchars on the sql queries in the profiling mode
|
2013-02-13 15:39:22 +01:00 |
|
|
Damien Metzger
|
dc5526c84c
|
[-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785
|
2013-02-13 15:16:17 +01:00 |
|
|
Damien Metzger
|
0986c1f594
|
// mod_filter is required with mod_deflate from apache 2.4
|
2013-02-13 14:46:34 +01:00 |
|
|
Damien Metzger
|
c6331299cb
|
// 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
|
ec98e4630f
|
[-] Core: upgrade smarty to 3.1.13
|
2013-02-13 14:30:45 +01:00 |
|
|
Rémi Gaillard
|
cd5faf8932
|
// small typo fix
|
2013-02-13 12:04:42 +01:00 |
|