fb93b5376b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:43:51 +01:00
1c7f88e048
[-] FO: fix Image attributes not set - #PSCFV-5957
2012-12-10 11:42:13 +01:00
c246082e72
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:39:11 +01:00
acfb43c284
[*] FO : Bug fix : h4 -> title_block
2012-12-10 11:38:48 +01:00
25229b51ae
[-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules
2012-12-10 11:16:33 +01:00
221667a80d
[-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied
2012-12-10 10:51:46 +01:00
53f1e8fcbb
// Display exception in admin regardless mode dev
2012-12-10 10:47:41 +01:00
2f3799abb8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 10:18:53 +01:00
9ab0485946
[*] FO : Cart vouchers style edited
2012-12-10 10:18:41 +01:00
ae7569bde3
[-] BO : added import button on listing
2012-12-10 10:14:03 +01:00
7e6d94053b
// small fix
2012-12-07 18:01:32 +01:00
90d4c27d17
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-07 18:01:46 +01:00
af3eb2cc38
//small js fix
2012-12-07 18:01:32 +01:00
3280bfbeed
[-] WS: Fix #PSCFV-5915 temporary images deletion
2012-12-07 17:58:46 +01:00
3497af985a
[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution
2012-12-07 17:23:06 +01:00
cc7c40d4e9
[-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline
2012-12-07 17:22:06 +01:00
7bc49194b7
[-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order
2012-12-07 16:23:52 +01:00
1c1fd827da
// small fix for urls
2012-12-07 11:46:50 +01:00
f40369ef6a
[-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules
2012-12-06 17:05:19 +01:00
adc1197320
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 16:53:37 +01:00
048f3cce14
[-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled
2012-12-06 16:53:29 +01:00
56819e3573
[-] FO: Fix some tax_display_method value for not default customer group
2012-12-06 16:38:31 +01:00
276696dd6c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 12:16:47 +01:00
61c23c7e75
[-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called
2012-12-06 12:16:37 +01:00
b474ca3d85
[-] FO: Fix cart summary ajax refreshment
2012-12-06 11:58:29 +01:00
4fa7eb6a3d
//revert all config.xml
2012-12-06 11:41:52 +01:00
e809f6bfdb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
6f37326675
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
d9ba307893
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
2a4b7cae75
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
cf7aebd029
Fix typo
2012-12-05 21:27:37 -06:00
c87fb469fd
Fix mail error
...
This changes two things in the mail class.
1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.
2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
7897d40e22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
5c63deb469
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
59e793fa99
//[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921
2012-12-05 10:42:26 +01:00
2c3ad2e7f9
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
89e9f90cf1
//small variable name fix
2012-12-04 18:35:10 +01:00
712f0c3d6d
[-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module
2012-12-04 18:29:10 +01:00
2b10fcd712
// change h4, h5
2012-12-04 17:15:49 +01:00
da5c5fb4a0
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
2d93064fb9
[-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled
2012-12-04 15:32:06 +01:00
9322f3338e
// fixed FO bugs
2012-12-04 15:27:43 +01:00
0071850981
[-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate
2012-12-04 15:09:41 +01:00
6cad7c2bf4
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
e568e0992d
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
b80bc2a6ba
[-] WS: Fix #PSCFV-5981 logo path
2012-12-04 11:52:04 +01:00
7d05a6d8e9
[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0
2012-12-04 11:38:47 +01:00
e5ec07f95a
[-] BO: Add display of modules errors on reset #PSCFV-2077
2012-12-04 11:13:06 +01:00
3510cc03ab
//small html fix
2012-12-04 11:07:56 +01:00
640c0202dd
Merge pull request #63 from Ha99y/blockcms-fix
...
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
sLorenzini