Rémi Gaillard
ef4b3576fc
[-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes
2012-12-11 16:05:29 +01:00
vAugagneur
5698e05f63
[-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO
2012-12-11 15:44:32 +01:00
Damien Metzger
575983a52e
// Fixed stripos !== false in module search
2012-12-11 15:36:51 +01:00
Damien Metzger
e6ad7ec815
[-] FO : jquery mobile was not compatible with js minifier, I updated both
2012-12-11 14:01:40 +01:00
Rémi Gaillard
a0041364a1
// replace bad attribute name
2012-12-11 12:11:47 +01:00
Rémi Gaillard
e8718ec42f
[-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885
2012-12-11 12:01:04 +01:00
Rémi Gaillard
a8096c2800
[-] BO: Fix various bugs in categories ntree generation
2012-12-11 11:19:21 +01:00
Damien Metzger
7eb764e596
// config.xml in english
2012-12-11 11:19:40 +01:00
Damien Metzger
b7d4321e5a
[-] MO : fixed backslashes in homeslider #PSCFV-5664
2012-12-11 11:16:56 +01:00
Rémi Gaillard
4c31212fa5
// Only js strings need to add slashes
2012-12-10 16:05:38 +01:00
Rémi Gaillard
131f99eb69
[-] Core: send email when payment is remotly accepted #PSCFV-6064
2012-12-10 15:57:59 +01:00
sLorenzini
ae2c41286f
[-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005
2012-12-10 15:17:23 +01:00
Rémi Gaillard
a68e5c1cfb
[-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function
2012-12-10 15:06:03 +01:00
vAugagneur
1db4c7875e
//added more check on module upload part 2
2012-12-10 14:45:14 +01:00
vAugagneur
401b3dd41d
//added more check on module upload
2012-12-10 14:44:11 +01:00
Rémi Gaillard
8b817a4a8c
[-] Core: Fix search indexation when id_product is forced #PSCFV-6039
2012-12-10 13:52:09 +01:00
sLorenzini
fb93b5376b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:43:51 +01:00
sLorenzini
1c7f88e048
[-] FO: fix Image attributes not set - #PSCFV-5957
2012-12-10 11:42:13 +01:00
Francois Gaillard
c246082e72
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 11:39:11 +01:00
Francois Gaillard
acfb43c284
[*] FO : Bug fix : h4 -> title_block
2012-12-10 11:38:48 +01:00
vAugagneur
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
vAugagneur
221667a80d
[-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied
2012-12-10 10:51:46 +01:00
Rémi Gaillard
53f1e8fcbb
// Display exception in admin regardless mode dev
2012-12-10 10:47:41 +01:00
Francois Gaillard
2f3799abb8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-10 10:18:53 +01:00
Francois Gaillard
9ab0485946
[*] FO : Cart vouchers style edited
2012-12-10 10:18:41 +01:00
vAugagneur
ae7569bde3
[-] BO : added import button on listing
2012-12-10 10:14:03 +01:00
Rémi Gaillard
7e6d94053b
// small fix
2012-12-07 18:01:32 +01:00
vAugagneur
90d4c27d17
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-07 18:01:46 +01:00
vAugagneur
af3eb2cc38
//small js fix
2012-12-07 18:01:32 +01:00
Rémi Gaillard
3280bfbeed
[-] WS: Fix #PSCFV-5915 temporary images deletion
2012-12-07 17:58:46 +01:00
Rémi Gaillard
3497af985a
[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution
2012-12-07 17:23:06 +01:00
vAugagneur
cc7c40d4e9
[-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline
2012-12-07 17:22:06 +01:00
vAugagneur
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
Rémi Gaillard
1c1fd827da
// small fix for urls
2012-12-07 11:46:50 +01:00
vAugagneur
f40369ef6a
[-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules
2012-12-06 17:05:19 +01:00
vAugagneur
adc1197320
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 16:53:37 +01:00
vAugagneur
048f3cce14
[-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled
2012-12-06 16:53:29 +01:00
Rémi Gaillard
56819e3573
[-] FO: Fix some tax_display_method value for not default customer group
2012-12-06 16:38:31 +01:00
vAugagneur
276696dd6c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 12:16:47 +01:00
vAugagneur
61c23c7e75
[-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called
2012-12-06 12:16:37 +01:00
Rémi Gaillard
b474ca3d85
[-] FO: Fix cart summary ajax refreshment
2012-12-06 11:58:29 +01:00
vAugagneur
4fa7eb6a3d
//revert all config.xml
2012-12-06 11:41:52 +01:00
vAugagneur
e809f6bfdb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
vAugagneur
6f37326675
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
Rémi Gaillard
d9ba307893
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
sLorenzini
2a4b7cae75
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
Milow
cf7aebd029
Fix typo
2012-12-05 21:27:37 -06:00
Milow
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
Sarah Lorenzini
7897d40e22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
sLorenzini
5c63deb469
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
Rémi Gaillard