Commit Graph
8137 Commits
Author SHA1 Message Date
Vincent Augagneur 34f67ec5e5 Merge pull request #219 from redpik/patch-1
[*] FO : oosHook must be a div, not a paragraph
2013-01-28 01:49:01 -08:00
Vincent Augagneur f56d10a4d8 Merge pull request #222 from PrestaEdit/patch-17
[-] MO: fix a problem with the wishlist_link
2013-01-28 01:48:03 -08:00
Vincent Augagneur 1cff484c3d Merge pull request #229 from PrestaEdit/patch-18
[*] Class Tools: enhance fd method
2013-01-28 01:29:43 -08:00
Gregory Roussac 2723595e10 // not commited sorry 2013-01-28 09:51:33 +01:00
Rémi Gaillard 3354db0f64 [-] BO: the attached file of downloadable products duplicated should not be the same than the original #PSCFV-7460 2013-01-25 15:57:54 +01:00
Rémi Gaillard 1629e68c68 [-] BO: Fix SQL request on downloadable product duplication 2013-01-25 15:47:09 +01:00
Rémi Gaillard d10daeedbb [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +01:00
sLorenzini 21e9a2c5a2 [-] FO: fixed bug Blocknewsletter.css has an extra bracket on the last line and when corrected override still won't work - #PSCFV-7436 2013-01-25 14:00:47 +01:00
sLorenzini 6e1f4a7bc7 [-] FO: fixed bug PSCFV-6644 2013-01-25 13:42:32 +01:00
Gregory Roussac 69771bc402 [-] BO : Do not display country formatting twice, neither in FO 2013-01-25 12:13:13 +01:00
Gregory Roussac c042a0b71b [-] FO : Fix bug #PSCFV-6655 2013-01-25 11:11:47 +01:00
vAugagneur fb2ec6349a [-] FO : fixed bug #PSCFV-7381 - free shipping when no carrier available 2013-01-25 09:54:08 +01:00
Gregory Roussac 3630c4e9c8 //fix warnings 2013-01-25 01:00:38 +01:00
Gregory Roussac f5678d31c2 [-] CORE : Missing displayError for alias q 2013-01-25 00:55:04 +01:00
PrestaEdit 909c124e69 [*] Class Tools: enhance fd method
Add the posibilities to set an error, warning, info or assert.

Usage:
Tools::fd('test');
		Tools::fd('test', 'debug');
		Tools::fd('test', 'info');
		Tools::fd('test', 'warn');
		Tools::fd('test', 'error');
		Tools::fd('test', 'assert');
2013-01-24 20:12:38 +01:00
vAugagneur 79c494aa90 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:51:13 +01:00
vAugagneur 8cedf1c43a [-] BO - fixed bug #PSCFV-6248 don't delete product when delete category and choose option to delete products 2013-01-24 18:51:09 +01:00
Rémi Gaillard 8b8451831e [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
vAugagneur dfad6d21a3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:26:33 +01:00
vAugagneur 210cc1ed01 [-] BO - fixed bug #PSCFV-6195 - Currency format not re-writing in product tab shipping 2013-01-24 18:26:29 +01:00
Rémi Gaillard 955e2c378d [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00
Rémi Gaillard 9fd52c56e2 [-] MO: Fix #PSCFV-7416 product name in blocklayered listing with multishop 2013-01-24 17:29:53 +01:00
vAugagneur 4a9c3df77c [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
Rémi Gaillard 9f2b4acf2f [-] BO: Fix #PSCFV-7377 second part 2013-01-24 15:14:47 +01:00
sLorenzini 808657f443 [-] FO: updated css product_list 2013-01-24 13:47:53 +01:00
Gregory Roussac 496999fb1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 10:23:39 +01:00
gRoussac 33f27c2c0b [-] FO : No error on first consultation of shopping cart with minimum purchase 2013-01-24 10:22:29 +01:00
sLorenzini f11faead01 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list 2013-01-24 10:11:41 +01:00
gRoussac 4b73d72a65 // parse error in last commit sorry 2013-01-24 09:41:35 +01:00
gRoussac 7b48cdd068 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
gRoussac 39d7863eac [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac 300259661a [-] FO : adding values to empty parameters in ajax of cart-summary.js 2013-01-23 18:36:20 +01:00
Rémi Gaillard 04e436551b [-] Installer: clear the database when an error occured during the install 2013-01-23 17:05:51 +01:00
Rémi Gaillard 43290dd47a [-] BO: Fix #PSCFV-7377 customizable fields on product duplication 2013-01-23 16:07:53 +01:00
gRoussac 72c76e3b59 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
sLorenzini d886bf3103 [-] FO: fixed bug css in IE 2013-01-23 15:31:01 +01:00
Rémi Gaillard 79860bfa12 [-] WS: Fix #PSCFV-6559 deletion of category images 2013-01-23 15:25:33 +01:00
Rémi Gaillard 150f8ae528 [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Vincent Augagneur 6b2fab87d2 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a
Synchronize the localization files in the solution with those on the PrestaShop server
2013-01-23 05:10:20 -08:00
djfm 5c1f5b0f23 // Synchronized localization files between server and solution 2013-01-23 10:33:32 +01:00
sLorenzini 60c4d09948 [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 2013-01-23 09:44:54 +01:00
Vincent Augagneur 9cf577ff0d //fixed bug with images when theme don't have associate image type 2013-01-23 09:30:49 +01:00
PrestaEdit 3b2b718f84 [-] MO: fix a problem with the wishlist_link
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.

Or, we can put this in a {$link->getModuleLink(...)} in TPL
2013-01-22 23:50:52 +01:00
gRoussac caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
Gregory Roussac 7a8fade4b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 16:33:56 +01:00
gRoussac c0e7444889 [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC 2013-01-22 16:32:55 +01:00
Benjamin PONGY c89ad555df [*] FO oosHook must be a div, not a paragraph
for code validation, oosHook must be a div, not a paragraph.
2013-01-22 15:19:52 +01:00
Rémi Gaillard 9e45ad974a [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Vincent Augagneur 377cc5d794 Merge pull request #183 from PrestaEdit/patch-8
[-] Small Fix: change documentation URL
2013-01-22 05:49:56 -08:00
Vincent Augagneur 9c821b3932 Merge pull request #184 from PrestaEdit/patch-9
// Welcome 2013
2013-01-22 05:49:18 -08:00