dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,245 Commits 9 Branches 19 Tags
2b5d600452fed194119dcd2e78fb29bbc6ae609b
Commit Graph
9245 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 2b5d600452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac 66fbbf4825 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
Vincent Augagneur 56831b9f33 Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
Vincent Augagneur a5f8263c9d Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Damien Metzger 36acfc1227 // Updated russian translation of the installer 2013-05-23 14:29:57 +02:00
Vincent Augagneur bbb24c3d1b Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Vincent Augagneur dd363be433 Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Damien Metzger affca31558 [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
Damien Metzger 9e7d2ac9c7 [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Damien Metzger c6ab6005f5 // Added error reporting level in dev mode 2013-05-23 10:50:22 +02:00
Damien Metzger 0b503a0c8b // Inverted 2 steps in the installer 2013-05-22 16:55:01 +02:00
Rémi Gaillard de945adf79 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
vAugagneur 487c567224 //small fix 2013-05-22 14:38:39 +02:00
Rémi Gaillard 1ab6befe0d Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
gRoussac f0abc2298c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00
gRoussac d1904e7c56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac 7713e86efc [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
djfm 5b250dbe8d // parse error 2013-05-22 11:11:37 +02:00
Rémi Gaillard c7a056f301 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard b65423f232 [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
gRoussac 9196ec042e // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac 3879897f38 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac a4c150d2fb [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac d6c1a2f038 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 2013-05-21 17:05:12 +02:00
gRoussac 9b8bfe1bbc [-] INSTALLER : SQL error during upgrade from 1.5.0.9 2013-05-21 16:47:53 +02:00
gRoussac 2f660b70b2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-21 16:29:48 +02:00
gRoussac 22ba79eb10 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array 2013-05-21 16:29:26 +02:00
Rémi Gaillard 2542e97164 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
PrestaEdit 446abf7e3f // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit 0abe3b3193 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
vAugagneur 43a333ff03 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur 70b061343b Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
Rémi Gaillard 0ddc7e0e4b // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
vAugagneur 2a606999fd //small bug 2013-05-21 10:30:35 +02:00
Vincent Augagneur 69c045d8fd Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Rémi Gaillard 7d5830af94 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Kevin Granger 3fd3ad2919 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
vAugagneur e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur 5244fdaa21 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur 90f0781377 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
Vincent Augagneur d106d3a136 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur 3368ff1d69 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
PrestaEdit c0b9736cf4 // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit 7864f38438 // Set params as null 2013-05-20 14:49:45 +02:00
Vincent Augagneur 7da7fd94fd Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur 3a9f82a7f0 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 12c43acd5b Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
Rémi Gaillard 7f92b45c33 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 614556ec3d // small fix 2013-05-20 10:58:49 +02:00