Commit Graph

7556 Commits

Author SHA1 Message Date
Rémi Gaillard 3f90d9edbc // small fix 2012-11-26 17:44:41 +01:00
Vincent Augagneur 04d982fd48 //clean Tools::clearCache() thanks to @alexsegura 2012-11-26 15:58:03 +01:00
Vincent Augagneur 1e0984d547 Merge pull request #47 from doekia/PSCFV-4181
[-] FO: PSCFV-4181: pruneoff unavailable products
2012-11-26 06:43:40 -08:00
Vincent Augagneur 7dd8950dd3 Merge pull request #48 from doekia/loadUpgradeVersionList
[+] BO: Allow override loadUpgradeVersionList()
2012-11-26 06:38:26 -08:00
Vincent Augagneur 69781ae79b small fix 2012-11-26 15:33:34 +01:00
(d)oekia 2735ff47bc unset should go after usage of by reference value 2012-11-26 15:08:32 +01:00
(d)oekia a11fa5fd14 Merge/simplify statements 2012-11-26 15:03:42 +01:00
(d)oekia 5a54e5b4d6 [+] BO: Allow override loadUpgradeVersionList() 2012-11-26 14:24:52 +01:00
(d)oekia 489fd28012 [-] FO: PSCFV-4181: pruneoff unavailable products 2012-11-26 14:11:35 +01:00
Vincent Augagneur 7b307c737a [-] FO : fixed bug #PSCFV-5293 - product link rewrite bug with category keyword 2012-11-26 12:06:03 +01:00
Francois Gaillard d5fc20435d // .DS_Store files added to .gitignore 2012-11-26 11:20:46 +01:00
Vincent Augagneur c76af96415 [-] BO : fixed bug #PSCFV-5838 Advanced Parameters - E-mail - Custom SMTP does not work if the password contains symbols '<' or '>' 2012-11-26 10:45:32 +01:00
Sarah Lorenzini 7e76e4b2e1 [-] FO: add target="_blank" on the "powered by" link in the footer 2012-11-26 10:12:20 +01:00
vAugagneur 885e44c58d //fixed code error in a pull request 2012-11-26 10:09:27 +01:00
Vincent Augagneur 7b2b33625a Merge pull request #43 from PrestaEdit/PSCFV-5580
[-] CORE : Class OrderHistory: changeIdOrderState() & Order current_state
2012-11-26 00:01:34 -08:00
Vincent Augagneur 634f98a5e5 Merge pull request #44 from PrestaEdit/PSCFV-5569
[-] FO : fixed bug #PSCFV-5569: remove warning if module "blocksuppliers" and "blockmanufacturer" is deleted
2012-11-25 23:57:13 -08:00
PrestaEdit 7ac2970aff // PSCFV-5569: remove warning if module "blocksuppliers" and "blockmanufacturer" is deleted 2012-11-25 23:08:47 +01:00
PrestaEdit dc43452f8d // Class OrderHistory: changeIdOrderState() & Order current_state 2012-11-25 22:42:31 +01:00
Francois Gaillard c9e3aa07aa Merge pull request #12 from prestarocket/ajax-cart.js
[*] FO : Clean selectors in ajax-cart.js
2012-11-23 10:17:06 -08:00
Francois Gaillard 78dc62a010 Merge pull request #26 from prestarocket/history.js
[*] FO : Clean history.js
2012-11-23 10:13:57 -08:00
Francois Gaillard d6bebf2864 Merge pull request #27 from prestarocket/product.js
[*] FO : Clean product.js
2012-11-23 10:12:41 -08:00
Francois Gaillard 4b3ea69526 Merge pull request #28 from prestarocket/order-opc
[*] FO : Clean order-opc.js
2012-11-23 10:08:32 -08:00
vAugagneur 6f4de596c6 [-] CORE : fixed bug #PSCFV-5536 - Layout for index controller is broken 2012-11-23 19:01:26 +01:00
Rémi Gaillard 8a3e8d1d73 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-23 17:59:46 +01:00
Rémi Gaillard 01bee20da6 [-] FO: Availability was not displayed anymore on product listing #PSCFV-5698 2012-11-23 17:59:41 +01:00
vAugagneur b8f8be8440 //small fix on datepicker 2012-11-23 17:46:37 +01:00
Rémi Gaillard 167da64574 [-] FO: Search product listing should use the stock of default attribute as in category product listing 2012-11-23 17:27:00 +01:00
Rémi Gaillard 29ba49b7d4 Merge pull request #36 from damonsk/patch1
[-] FO: Double quote was missing on a TPL
2012-11-23 07:37:10 -08:00
vAugagneur 0e0ca2a473 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
Rémi Gaillard 3664925fb9 Merge pull request #34 from PrestaEdit/blockwishlist
[-] MO: use addJS instead of a tpl file
2012-11-23 07:34:33 -08:00
Damon Skelhorn 3ee47e3aa1 Missing dbl quote on href 2012-11-23 15:18:21 +00:00
Jonathan Danse b8c1783985 [-] MO : use addJS instead of a tpl file 2012-11-23 16:03:17 +01:00
vAugagneur f7ff85b1bf [-] CORE : fixed bug #PSCFV-5572 - getJqueryPluginCSSPath method does not pass folder argument 2012-11-23 16:00:17 +01:00
Rémi Gaillard f5d4fbccfd FO: Fix #PSCFV-5800 don't send any cookie on canonical redirection 2012-11-23 15:44:23 +01:00
vAugagneur 67be4309d2 [-] : FO : fixed bug #PSCFV-5811 Can't choose a carrier when using OPC with tab / smartphone 2012-11-23 15:32:16 +01:00
DamienMetzger 89e207bc4e [-] BO : you can now remove the english language by whatever mean you like most #PSCFV-5815 2012-11-23 15:13:47 +01:00
Rémi Gaillard f400a32884 [-] Installer: Fix #PSCFV-5367 update of uploadable_files field was missing in the upgrade of multishop 2012-11-23 15:13:22 +01:00
Rémi Gaillard a287069d66 [-] MO: Fix #PSCFV-5246 add and remove favorite products was not working using SSL 2012-11-23 14:55:13 +01:00
Rémi Gaillard ac5e64e7a7 // Fix admin listing on some tab 2012-11-23 14:30:00 +01:00
Vincent Augagneur 541fb6b675 Merge pull request #23 from Caleydon/patch-2
[+] FO : improve SEO and accessibility in blockcart.tpl
2012-11-23 02:46:31 -08:00
DamienMetzger 28a75f89c3 [-] BO : admin does not crash anymore when custom BO theme is not available #PSCFV-5492 2012-11-23 11:28:31 +01:00
DamienMetzger ea436c5eb8 [-] FO : changed redirection management when accessing page number out of scope #PSCFV-5567 2012-11-23 11:02:23 +01:00
Vincent Augagneur d08cb3b713 Merge pull request #30 from bumbu/patch-1
[-] BO : fixed bug #PNM-687 Back-office form field input with flag lang=>false cause error
2012-11-23 01:55:07 -08:00
DamienMetzger 7fc19de6d3 [-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626 2012-11-23 10:41:34 +01:00
DamienMetzger 0468bdbc03 [-] FO : fixed a problem with quantity of customized products #PSCFV-5630
[-] FO : removed cart rules already in the cart from available cart rules in the cart summary
2012-11-23 10:39:04 +01:00
DamienMetzger fc7d62eddf [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
DamienMetzger ff55d6e6bb [-] FO : removed useless extra parameter not implemented in Manufacturer::getManufacturers() #PSCFV-5771 2012-11-23 09:48:51 +01:00
Vincent Augagneur 198c7da457 Merge pull request #18 from Caleydon/patch-8
[+] FO : Update themes/default/password.tpl added rel="nofollow" parameters
2012-11-23 00:33:53 -08:00
Vincent Augagneur 191b6ca526 Merge pull request #17 from axome/ColorEmail
[+] CORE : Remove color for email in *.php
2012-11-23 00:18:29 -08:00
bumbu d1f77b787b Update admin-dev/themes/default/template/helpers/form/form.tpl
Fix error that appears on adding input with attribute 'lang' => false to admin controller form.
2012-11-22 23:31:44 +02:00