Rémi Gaillard
27ae42b086
[-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function
2012-12-10 15:06:03 +01:00
vAugagneur
83318055ce
//added more check on module upload part 2
2012-12-10 14:45:14 +01:00
vAugagneur
337437be74
//added more check on module upload
2012-12-10 14:44:11 +01:00
Rémi Gaillard
29b4adb032
[-] Core: Fix search indexation when id_product is forced #PSCFV-6039
2012-12-10 13:52:09 +01:00
sLorenzini
05d5ab2df3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:43:51 +01:00
sLorenzini
dbe2d7998a
[-] FO: fix Image attributes not set - #PSCFV-5957
2012-12-10 11:42:13 +01:00
François Gaillard
8b97a15405
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:39:11 +01:00
François Gaillard
6173a98b58
[*] FO : Bug fix : h4 -> title_block
2012-12-10 11:38:48 +01:00
vAugagneur
1b71add855
[-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules
2012-12-10 11:16:33 +01:00
vAugagneur
eb451604af
[-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied
2012-12-10 10:51:46 +01:00
Rémi Gaillard
60e99d6b66
// Display exception in admin regardless mode dev
2012-12-10 10:47:41 +01:00
François Gaillard
6483525900
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 10:18:53 +01:00
François Gaillard
312df517fb
[*] FO : Cart vouchers style edited
2012-12-10 10:18:41 +01:00
vAugagneur
20187807e1
[-] BO : added import button on listing
2012-12-10 10:14:03 +01:00
PrestaEdit
5e563f2a48
[-] FO : mobile template - states management
2012-12-08 23:46:14 +01:00
montes
48d6b63d8e
Fixed variable typo (redution instead of reduction in some places)
2012-12-07 23:24:41 +01:00
Rémi Gaillard
db9ff416c0
// small fix
2012-12-07 18:01:32 +01:00
vAugagneur
1d70dad851
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-07 18:01:46 +01:00
vAugagneur
e65478a1b4
//small js fix
2012-12-07 18:01:32 +01:00
Rémi Gaillard
d274f6d84a
[-] WS: Fix #PSCFV-5915 temporary images deletion
2012-12-07 17:58:46 +01:00
Rémi Gaillard
cd7cc208e8
[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution
2012-12-07 17:23:06 +01:00
vAugagneur
6dd0a04ed0
[-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline
2012-12-07 17:22:06 +01:00
vAugagneur
006bb7b19a
[-] 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
Rémi Gaillard
5bcc1417dd
// small fix for urls
2012-12-07 11:46:50 +01:00
vAugagneur
4dbb321836
[-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules
2012-12-06 17:05:19 +01:00
vAugagneur
accb337006
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 16:53:37 +01:00
vAugagneur
52f4fca6e1
[-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled
2012-12-06 16:53:29 +01:00
Rémi Gaillard
224646ef1f
[-] FO: Fix some tax_display_method value for not default customer group
2012-12-06 16:38:31 +01:00
David Gasperoni
310dbaaf24
move header tag out of carrier block
2012-12-06 15:06:08 +01:00
David Gasperoni
3b9b19ec48
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:56:06 +01:00
David Gasperoni
497968fd7a
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:52:14 +01:00
David Gasperoni
094e38206c
order carrier more compatible with opc
...
The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
2012-12-06 14:46:40 +01:00
vAugagneur
78bfcfbaf0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 12:16:47 +01:00
vAugagneur
640ec6d006
[-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called
2012-12-06 12:16:37 +01:00
Rémi Gaillard
0e0f6ee641
[-] FO: Fix cart summary ajax refreshment
2012-12-06 11:58:29 +01:00
vAugagneur
76b435b639
//revert all config.xml
2012-12-06 11:41:52 +01:00
vAugagneur
12f47a1b9b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
vAugagneur
d71970d5ff
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
Rémi Gaillard
2166937cf5
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
sLorenzini
2191eec919
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
Milow
82c7f03119
Fix typo
2012-12-05 21:27:37 -06:00
Milow
55e55689a6
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
Sarah Lorenzini
8ddafa2568
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
sLorenzini
4844914b0a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
sLorenzini
babded4d29
//[-] 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
vAugagneur
6e9ea91ae7
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
vAugagneur
6740906dcb
//small variable name fix
2012-12-04 18:35:10 +01:00
vAugagneur
2c095c11a1
[-] 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
Sarah Lorenzini
31efb947ab
// change h4, h5
2012-12-04 17:15:49 +01:00
Rémi Gaillard
4e9c534f1b
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
Rémi Gaillard