Commit Graph
9265 Commits
Author SHA1 Message Date
dreammeup 82c7e3eeff Correcting errors in order graph at admin home
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.

So it corrects the number who was totally wrong.
2013-07-16 15:34:52 +02:00
gRoussac f0dbe3b86c [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 11:23:33 +02:00
gRoussac ccf2baec3a [-] PDF : Fix dejavusans font for en lang 2013-05-27 10:52:57 +02:00
gRoussac d040e5e1ae // norms 2013-05-27 10:35:19 +02:00
gRoussac a412cbb62e // report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ee604d6b13115d11b17f8806aef0543500bc6e51 2013-05-27 10:21:23 +02:00
gRoussac 5c6db0510f [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f 2013-05-27 10:12:41 +02:00
gRoussac b05ffb6a89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 17:22:20 +02:00
gRoussac 95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-24 17:21:56 +02:00
François Gaillard adb0da00f6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 11:39:37 +02:00
François Gaillard 3b1a9f9f80 [-] BO : Fixed unregistered version field for some modules 2013-05-24 11:39:20 +02:00
Rémi Gaillard 3de79c7015 // same for attributes and attributegroups 2013-05-24 11:33:58 +02:00
Rémi Gaillard 3b5f18a96d [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
vAugagneur bc0c8ba2e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 10:48:15 +02:00
vAugagneur cc79b6a675 [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly 2013-05-24 10:47:48 +02:00
gRoussac a28a8598ba Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 16:14:37 +02:00
gRoussac 4b64afd4ee [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
Vincent Augagneur 288e88b183 Merge pull request #393 from PrestaEdit/patch-33
[-] MO: feeder / RSS Valid
2013-05-23 06:25:19 -07:00
vAugagneur 6d0c69a07f //Merged pull request 124 - thanks to @rynge 2013-05-23 15:24:25 +02:00
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