Commit Graph

18638 Commits

Author SHA1 Message Date
vAugagneur 8dd256fbb3 //fixed code error in a pull request 2012-11-26 10:09:27 +01:00
vAugagneur 885e44c58d //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 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 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
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 445e835bc8 // PSCFV-5442: rss and &amp problem 2012-11-26 00:10:34 +01:00
PrestaEdit 0294c733b8 // PSCFV-5442: rss and &amp problem 2012-11-26 00:10:34 +01:00
PrestaEdit 1dd44868e8 // PSCFV-5569: remove warning if module "blocksuppliers" and "blockmanufacturer" is deleted 2012-11-25 23:08:47 +01:00
PrestaEdit 7ac2970aff // 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
PrestaEdit dc43452f8d // Class OrderHistory: changeIdOrderState() & Order current_state 2012-11-25 22:42:31 +01:00
PrestaEdit 1f294db1a2 // smarty_modifier_truncate (__call) 2012-11-25 22:23:56 +01:00
PrestaEdit 79782858f0 // smarty_modifier_truncate (__call) 2012-11-25 22:23:56 +01:00
jessylenne 554f466ed4 Update classes/Mail.php
lang.php inclusion path correction
- In case of theme directory use
- In case of override/classes/Mail.php use
2012-11-24 18:08:27 +01:00
jessylenne f4d53784f6 Update classes/Mail.php
lang.php inclusion path correction
- In case of theme directory use
- In case of override/classes/Mail.php use
2012-11-24 18:08:27 +01:00
Milow 2118118cfa Fixup js/tools/statesManagement.js
Replace == with === and != with !==
2012-11-23 23:02:28 -06:00
Milow 9c5984178f Fixup js/tools/statesManagement.js
Replace == with === and != with !==
2012-11-23 23:02:28 -06:00
Milow bceb2ee3f9 Fixup js/tools.js
1. Replace == with === and != with !==
2. Add missing semicolons to lines 238 and 241
2012-11-23 22:58:54 -06:00
Milow 3f01a6f587 Fixup js/tools.js
1. Replace == with === and != with !==
2. Add missing semicolons to lines 238 and 241
2012-11-23 22:58:54 -06:00
Milow 1a2a714a16 Fixup js/stores.js
1. Replace == with === and != with !==
2. Fixed variable scrope issue
3. Added missing () to constructors on lines 165 and 186
2012-11-23 22:53:44 -06:00
Milow b9a79e196d Fixup js/stores.js
1. Replace == with === and != with !==
2. Fixed variable scrope issue
3. Added missing () to constructors on lines 165 and 186
2012-11-23 22:53:44 -06:00
Milow f6e26c66cb Fixup js/scenes.js
Replace == with ===
2012-11-23 22:49:34 -06:00
Milow 5c2f6e5817 Fixup js/scenes.js
Replace == with ===
2012-11-23 22:49:34 -06:00
Milow 4e46f39360 Fix up js/products-comparison.js
Replace == with ===
2012-11-23 22:48:16 -06:00
Milow 773977c113 Fix up js/products-comparison.js
Replace == with ===
2012-11-23 22:48:16 -06:00
Milow f15e8399ff Fixup js/product.js
Error fixes:
1. Added missing semicolons to lines 94, 103, and 680

General fixes:
1. Replace new Array() with []
2. Replace new Number with simply 0. If not, === checks will be broken
3. Replace == with === and != with !==
4. Fixed a couple variable scopes
5. Removed var from line 423 that was not needed because it was already
defined
6. Added vars to for loops
2012-11-23 22:45:47 -06:00
Milow 76819eff1c Fixup js/product.js
Error fixes:
1. Added missing semicolons to lines 94, 103, and 680

General fixes:
1. Replace new Array() with []
2. Replace new Number with simply 0. If not, === checks will be broken
3. Replace == with === and != with !==
4. Fixed a couple variable scopes
5. Removed var from line 423 that was not needed because it was already
defined
6. Added vars to for loops
2012-11-23 22:45:47 -06:00
Milow b6052413c6 Fixup js/order-opc.js
Error fixes:
1. Added missing var on line 89
2. Added missing semicolons on lines 98, 104, 110, 181, 766, 781

General fixes:
1. Replace == with === and != with !==
2. Added missing var to for loops
3. Moved a few var scopes to the correct location
2012-11-23 22:23:28 -06:00
Milow c57c53711a Fixup js/order-opc.js
Error fixes:
1. Added missing var on line 89
2. Added missing semicolons on lines 98, 104, 110, 181, 766, 781

General fixes:
1. Replace == with === and != with !==
2. Added missing var to for loops
3. Moved a few var scopes to the correct location
2012-11-23 22:23:28 -06:00
Milow 0f6d6e9747 Fixup js/order-address.js
Replace == with === and != with !==
Added var to for loop
2012-11-23 22:09:15 -06:00
Milow 41371b1938 Fixup js/order-address.js
Replace == with === and != with !==
Added var to for loop
2012-11-23 22:09:15 -06:00
Milow 766a9677e2 Fixup js/history.js
Change == to === and != to !==
2012-11-23 22:06:11 -06:00
Milow 89d03a6aa6 Fixup js/history.js
Change == to === and != to !==
2012-11-23 22:06:11 -06:00
Milow 2ed7b970a8 Fixup js/cart-summary.js
Cleanup of cart-summary.js

Error fixes:
1. Added two missing semicolons on line 34 and line 622
2. Fix var scrope around lines 229 and 805

General fixes:
1. Changed all == to === and != to !==
2. Added missing var to undefined variables in for loops
2012-11-23 22:02:11 -06:00
Milow 8e01829bf0 Fixup js/cart-summary.js
Cleanup of cart-summary.js

Error fixes:
1. Added two missing semicolons on line 34 and line 622
2. Fix var scrope around lines 229 and 805

General fixes:
1. Changed all == to === and != to !==
2. Added missing var to undefined variables in for loops
2012-11-23 22:02:11 -06:00
Milow a6db212acf Fix css errors
In css/admin.css, cellpadding and cellspacing are not valid css, so
replace them with the correct css equivalent.

In css/product.css, simply remove an extra 6 on color.
2012-11-23 20:37:20 -06:00
Milow 1375ca9590 Fix css errors
In css/admin.css, cellpadding and cellspacing are not valid css, so
replace them with the correct css equivalent.

In css/product.css, simply remove an extra 6 on color.
2012-11-23 20:37:20 -06: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
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
François Gaillard ac3a72baf2 Merge pull request #26 from prestarocket/history.js
[*] FO : Clean history.js
2012-11-23 10:13:57 -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
François Gaillard b0e8a6240a Merge pull request #27 from prestarocket/product.js
[*] FO : Clean product.js
2012-11-23 10:12:41 -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
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
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 a173fb5702 [-] CORE : fixed bug #PSCFV-5536 - Layout for index controller is broken 2012-11-23 19:01:26 +01: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 8d84a00cb3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-23 17:59:46 +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