dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,641 Commits 9 Branches 19 Tags
0fb8bb1127c54975689b0edc39d5b02a2ec052d9
Commit Graph
8641 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 1812937933 [-] BO: Fix product image link for admin orders #PSCFV-5163 2012-11-27 11:55:58 +01:00
Vincent Augagneur 91d53843d9 Merge pull request #51 from PrestaEdit/PSCFV-5872 
[-] CORE : fixed bug #PSCFV-5872: Modify is_a() with instanceof
 2012-11-27 01:32:07 -08:00
Jonathan Danse 41f7a8678f // add $usetax in block BestSellers 2012-11-27 10:24:46 +01:00
vAugagneur 9e0ad934f8 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList 2012-11-27 10:10:00 +01:00
Jonathan Danse 53b1475631 // remove test in Product 2012-11-27 10:09:22 +01:00
Jonathan Danse 8e4d5057ae // $module_name is a string, test not good 2012-11-27 09:30:04 +01:00
PrestaEdit 7827d02eaf // Modify is_a() with instanceof 2012-11-26 23:12:17 +01:00
PrestaEdit 76e7fc15ee //add Cart ID into $cache_id 2012-11-26 22:51:37 +01:00
PrestaEdit 74f4942254 // If default group of customer don't display tax, do not use them 2012-11-26 22:42:57 +01:00
Rémi Gaillard a9ccf0a3e3 // small fix 2012-11-26 19:14:06 +01:00
Rémi Gaillard cd4c7b28c3 // small fix some $ was missing :] 2012-11-26 19:12:53 +01:00
Rémi Gaillard 3f90d9edbc // small fix 2012-11-26 17:44:41 +01:00
Gabriel Schwardy 3b265a7922 Update themes/default/sitemap.tpl 2012-11-26 17:14:14 +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 0294c733b8 // PSCFV-5442: rss and &amp problem 2012-11-26 00:10:34 +01: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
PrestaEdit 79782858f0 // smarty_modifier_truncate (__call) 2012-11-25 22:23:56 +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 9c5984178f Fixup js/tools/statesManagement.js 
Replace == with === and != with !==
 2012-11-23 23:02:28 -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 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 5c2f6e5817 Fixup js/scenes.js 
Replace == with ===
 2012-11-23 22:49:34 -06:00
Milow 773977c113 Fix up js/products-comparison.js 
Replace == with ===
 2012-11-23 22:48:16 -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 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 41371b1938 Fixup js/order-address.js 
Replace == with === and != with !==
Added var to for loop
 2012-11-23 22:09:15 -06:00
Milow 89d03a6aa6 Fixup js/history.js 
Change == to === and != to !==
 2012-11-23 22:06: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 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
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