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
a1e91bcfa9
[-] 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
sLorenzini
52803b40b9
// fixed FO bugs
2012-12-04 15:27:43 +01:00
Rémi Gaillard
b414bd06a4
[-] 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
Rémi Gaillard
a4b6594f9c
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
Rémi Gaillard
e70069bdfa
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
Rémi Gaillard
aac0500c72
[-] WS: Fix #PSCFV-5981 logo path
2012-12-04 11:52:04 +01:00
Rémi Gaillard
69fbd79eee
[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0
2012-12-04 11:38:47 +01:00
Rémi Gaillard
6e87020ddf
[-] BO: Add display of modules errors on reset #PSCFV-2077
2012-12-04 11:13:06 +01:00
vAugagneur
8baa2b34b8
//small html fix
2012-12-04 11:07:56 +01:00
Vincent Augagneur
85daf29f87
Merge pull request #63 from Ha99y/blockcms-fix
...
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
Rémi Gaillard
1091d82546
// Fix PHP warning
2012-12-03 19:11:37 +01:00
Rémi Gaillard
627125e1de
[-] BO: Fix #PSCFV-5706 save of product availability on global context
2012-12-03 17:53:47 +01:00
Rémi Gaillard
f8365220e2
[-] Core: Fix isDate validator
2012-12-03 16:52:22 +01:00
Rémi Gaillard
a3c28f3ace
[-] Core: Fix date validator #PSCFV-5797
2012-12-03 16:12:08 +01:00
vAugagneur
b1706d47eb
//small js fix
2012-12-03 15:55:46 +01:00
vAugagneur
9875e5581c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-03 15:23:40 +01:00
vAugagneur
c769a2599c
[-] BO : fixed bug when toggle status on product listing, redirect_type was not good
2012-12-03 15:23:25 +01:00
Rémi Gaillard
769f5e7a64
[-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported
2012-12-03 15:03:32 +01:00
vAugagneur
51d8ef576b
//small fix with js on product page
2012-12-03 14:47:38 +01:00
vAugagneur
c2f31109e4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-03 14:14:54 +01:00
vAugagneur
2195f9bdcb
[+] CORE : now you can choose the redirect option when your product is disable
2012-12-03 14:13:50 +01:00
Rémi Gaillard
4a94d54f6d
[-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image
2012-12-03 12:26:27 +01:00
Rémi Gaillard
c73be7904a
[-] BO: Fix category association in global context #PSCFV-5551
2012-12-03 11:25:59 +01:00
Rémi Gaillard
5b9f6dffc9
[-] FO: js was missing on order follow #PSCFV-5441
2012-12-03 10:44:32 +01:00
Sarah Lorenzini
585d7ddbab
[-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013
2012-12-03 10:25:35 +01:00
vAugagneur
0de7579f58
//remove debug
2012-12-02 20:05:39 +01:00
vAugagneur
49e1a536e3
[*] FO : improve SEO and http error code
2012-12-02 19:46:09 +01:00
Ha!*!*y
2a11d0c9b6
Update modules/blockcms/blockcms.tpl
...
remove blockpermanentlinks and ID header_link_sitemap
https://github.com/PrestaShop/PrestaShop/pull/11
2012-12-01 22:09:00 -08:00
Sarah Lorenzini
22d92a6d3a
[-] FO: fix Add to cart button needs some changes in its css code - #PSCFV-5933
2012-11-30 16:30:34 +01:00
Vincent Augagneur
bf08de2c3b
Merge pull request #45 from PrestaEdit/PSCFV-5442
...
[-] FO : Fixed bug #PSCFV-5442: rss and & problem
2012-11-30 02:57:06 -08:00
Vincent Augagneur
7c04885560
Merge pull request #55 from PrestaEdit/mobile_logo
...
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
Vincent Augagneur
66108a770b
Merge pull request #40 from Milow/development
...
[-] FO : Fix css errors, clean up javascript
2012-11-30 02:02:42 -08:00
vAugagneur
c6a1e0e585
//updated CONTRIBUTORS.md thanks @all
2012-11-30 10:54:08 +01:00
vAugagneur
f1b36279cf
//small cookie expire fix
2012-11-30 09:35:42 +01:00
PrestaEdit
68c3f18f16
Merge pull request #1 from PrestaEdit/mobile
...
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit
291431fc49
[*] FO: use initLogoAndFavicon() function
2012-11-29 21:57:04 +01:00
PrestaEdit
b433db02b1
[*] FO: add initLogoAndFavicon()
2012-11-29 21:56:03 +01:00
vAugagneur
91a31bf556
[-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module
2012-11-29 18:51:22 +01:00
Rémi Gaillard