Commit Graph

7546 Commits

Author SHA1 Message Date
François Gaillard 4cc977b065 // .DS_Store files added to .gitignore 2012-11-26 11:20:46 +01:00
Vincent Augagneur db8715c62f [-] 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 86ec8a10d5 [-] FO: add target="_blank" on the "powered by" link in the footer 2012-11-26 10:12:20 +01:00
vAugagneur 8dd256fbb3 //fixed code error in a pull request 2012-11-26 10:09:27 +01:00
Vincent Augagneur c00e3218c9 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 3da9f5919a 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 1dd44868e8 // PSCFV-5569: remove warning if module "blocksuppliers" and "blockmanufacturer" is deleted 2012-11-25 23:08:47 +01:00
PrestaEdit a34ba587f7 // Class OrderHistory: changeIdOrderState() & Order current_state 2012-11-25 22:42:31 +01:00
François Gaillard 6dc773d32e Merge pull request #12 from prestarocket/ajax-cart.js
[*] FO : Clean selectors in ajax-cart.js
2012-11-23 10:17:06 -08:00
François Gaillard ac3a72baf2 Merge pull request #26 from prestarocket/history.js
[*] FO : Clean history.js
2012-11-23 10:13:57 -08:00
François Gaillard b0e8a6240a Merge pull request #27 from prestarocket/product.js
[*] FO : Clean product.js
2012-11-23 10:12:41 -08:00
François Gaillard a02f12bcea Merge pull request #28 from prestarocket/order-opc
[*] FO : Clean order-opc.js
2012-11-23 10:08:32 -08:00
vAugagneur a173fb5702 [-] CORE : fixed bug #PSCFV-5536 - Layout for index controller is broken 2012-11-23 19:01:26 +01:00
Rémi Gaillard 8d84a00cb3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-23 17:59:46 +01:00
Rémi Gaillard 1a240dcd3f [-] FO: Availability was not displayed anymore on product listing #PSCFV-5698 2012-11-23 17:59:41 +01:00
vAugagneur 8f9c00f019 //small fix on datepicker 2012-11-23 17:46:37 +01:00
Rémi Gaillard 17a3d8ec76 [-] 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 33781e0aad Merge pull request #36 from damonsk/patch1
[-] FO: Double quote was missing on a TPL
2012-11-23 07:37:10 -08:00
vAugagneur 049caca3b7 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
Rémi Gaillard f3b153ed6b 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 6f063ff303 Missing dbl quote on href 2012-11-23 15:18:21 +00:00
Jonathan Danse a9edb1d1c8 [-] MO : use addJS instead of a tpl file 2012-11-23 16:03:17 +01:00
vAugagneur a25fa92e2e [-] CORE : fixed bug #PSCFV-5572 - getJqueryPluginCSSPath method does not pass folder argument 2012-11-23 16:00:17 +01:00
Rémi Gaillard 037f0e6d3c FO: Fix #PSCFV-5800 don't send any cookie on canonical redirection 2012-11-23 15:44:23 +01:00
vAugagneur 7131148991 [-] : 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 41042664f9 [-] 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 7dee7977e5 [-] 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 e444f971b2 [-] 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 6bbd93ddb1 // Fix admin listing on some tab 2012-11-23 14:30:00 +01:00
Vincent Augagneur 383b93b40f 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 b62466c753 [-] BO : admin does not crash anymore when custom BO theme is not available #PSCFV-5492 2012-11-23 11:28:31 +01:00
DamienMetzger d793984de2 [-] FO : changed redirection management when accessing page number out of scope #PSCFV-5567 2012-11-23 11:02:23 +01:00
Vincent Augagneur cde774b552 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 4368782c4b [-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626 2012-11-23 10:41:34 +01:00
DamienMetzger 50f5b20f00 [-] 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 1df709fcfd [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
DamienMetzger d2a442fb59 [-] FO : removed useless extra parameter not implemented in Manufacturer::getManufacturers() #PSCFV-5771 2012-11-23 09:48:51 +01:00
Vincent Augagneur ca4ff12afc 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 1504c07fea Merge pull request #17 from axome/ColorEmail
[+] CORE : Remove color for email in *.php
2012-11-23 00:18:29 -08:00
bumbu 51dd140f97 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
adonis karavokyros a17ab9d1ea Clean order-opc.js
Jquery Selectors : keep it simple
2012-11-22 21:46:03 +01:00
adonis karavokyros a177e1bc54 Clean product.js
Jquery Selector : keep it simple
2012-11-22 21:37:44 +01:00
adonis karavokyros bcac1037fb Clean history.js
js selectors should be more simple in order to be more flexible in
theme development
2012-11-22 21:19:12 +01:00
DamienMetzger 6171d1af59 [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +01:00
DamienMetzger 77b80d8ec2 [-] FO : fixed parse error on ContactController.php #PSCFV-5803 2012-11-22 19:30:05 +01:00
Rémi Gaillard e3457836d8 [-] BO: Fix #PSCFV-5207 update of some fields on multishop with deleted property 2012-11-22 19:02:55 +01:00
Sarah Lorenzini 92541b8aca [-] FO : fixed bug #PSCFV-5649 - Product comparison error when Features are not set 2012-11-22 18:42:56 +01:00
vAugagneur 625e0f0c5b //small fix in adminThemeController 2012-11-22 18:27:07 +01:00
DamienMetzger 308b27d22b [-] FO : store locator working hours fixed #PSCFV-5709 2012-11-22 18:13:53 +01:00
vAugagneur 992897e785 //fix sarah bug :p part 2 2012-11-22 17:57:19 +01:00