dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,246 Commits 9 Branches 19 Tags
9e2c5bfcb9f99d19d65ca3db4eb7ea9adcc306e5
Commit Graph

9246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 9e2c5bfcb9 [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
gRoussac b2bb233dc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac dd2d7491b4 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
Vincent Augagneur 444f59c9aa 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 c9c458a64c Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Damien Metzger bf525275e3 // Updated russian translation of the installer 2013-05-23 14:29:57 +02:00
Vincent Augagneur 3c73ec5deb 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 f234d847fb 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 a57003749b [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
Damien Metzger 478dd0d39d [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Damien Metzger d8f1226bd7 // Added error reporting level in dev mode 2013-05-23 10:50:22 +02:00
Damien Metzger 8d012e30d4 // Inverted 2 steps in the installer 2013-05-22 16:55:01 +02:00
Rémi Gaillard 5fed3e99e0 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
vAugagneur 4f8b73ef9d //small fix 2013-05-22 14:38:39 +02:00
Rémi Gaillard da109d56f6 Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
gRoussac 2590465a7c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00
gRoussac 7f65d01692 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac 62cbee150b [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
djfm da2db7d799 // parse error 2013-05-22 11:11:37 +02:00
Rémi Gaillard 0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
gRoussac 41184dac33 // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac 949333c1c4 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac 65123157fc [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac b64cf50391 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 2013-05-21 17:05:12 +02:00
gRoussac 93e3ac23ff [-] INSTALLER : SQL error during upgrade from 1.5.0.9 2013-05-21 16:47:53 +02:00
gRoussac 58acc64ed8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-21 16:29:48 +02:00
gRoussac f6ccbb0080 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array 2013-05-21 16:29:26 +02:00
Rémi Gaillard 5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
PrestaEdit f5828aa49a // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit 770d925729 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
vAugagneur dc5df43d16 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur 6d6b2ef7d3 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 7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
vAugagneur 0d4fd0729b //small bug 2013-05-21 10:30:35 +02:00
Vincent Augagneur 5c9abe1194 Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Rémi Gaillard 532a727cc2 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Kevin Granger 2a3820f068 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur ec87deb016 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur 7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
Vincent Augagneur e157a8f0d4 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur 3bd489df15 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
PrestaEdit 62f350334c // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit c573819dc9 // Set params as null 2013-05-20 14:49:45 +02:00
Vincent Augagneur bf2cb18c1f Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur 8e64dd9141 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 025550b4ce Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
Rémi Gaillard 2fe8b5cf23 // small fix again... 2013-05-20 11:08:05 +02:00