Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• 040ff3396a [-] MO : Remove link "Notify me when available" when in stock runningz 2013-05-28 23:06:05 +03:00
• 08023b4bc3 [-] FO: Fix Carrier::getDeliveredCountries for multishop #PSCFV-9279 Rémi Gaillard 2013-05-28 17:41:20 +02:00
• 1cd0135aff [-] MO: Fix double html entities on link edition in the blocktopmenumodule #PSCFV-8808 Rémi Gaillard 2013-05-28 11:05:51 +02:00
• cbaae172cd [-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded gRoussac 2013-05-28 10:29:51 +02:00
• 1652f3575c [*] MO : blockcart - simpler selectors Grégoire Bélorgey 2013-05-28 09:37:32 +02:00
• ea5405a917 [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 gRoussac 2013-05-27 19:06:59 +02:00
• 9845966a88 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-27 19:02:40 +02:00
• a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link gRoussacandFrancois Gaillard 2013-05-27 11:23:33 +02:00
• 4eabc11573 [-] PDF : Fix dejavusans font for en lang gRoussacandFrancois Gaillard 2013-05-27 10:52:57 +02:00
• 94f7b2fa3c // norms gRoussacandFrancois Gaillard 2013-05-27 10:35:19 +02:00
• f591249248 // report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ee604d6b13115d11b17f8806aef0543500bc6e51 gRoussacandFrancois Gaillard 2013-05-27 10:21:23 +02:00
• f8359173be [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f gRoussacandFrancois Gaillard 2013-05-27 10:12:41 +02:00
• fce9a0e285 // same for attributes and attributegroups Rémi GaillardandFrancois Gaillard 2013-05-24 11:33:58 +02:00
• 5743696596 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country gRoussacandFrancois Gaillard 2013-05-24 17:21:56 +02:00
• 97e4284f16 [-] BO : Fixed unregistered version field for some modules Francois Gaillard 2013-05-24 11:39:20 +02:00
• e667e80280 // small changes in russian installer translation fram 2013-05-27 11:58:09 +00:00
• f0dbe3b86c [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link gRoussac 2013-05-27 11:23:33 +02:00
• ccf2baec3a [-] PDF : Fix dejavusans font for en lang gRoussac 2013-05-27 10:52:57 +02:00
• d040e5e1ae // norms gRoussac 2013-05-27 10:35:19 +02:00
• a412cbb62e // report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ee604d6b13115d11b17f8806aef0543500bc6e51 gRoussac 2013-05-27 10:21:23 +02:00
• 5c6db0510f [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f gRoussac 2013-05-27 10:12:41 +02:00
• 3c129a0e64 Merge remote-tracking branch 'upstream/development' into development Grégoire Bélorgey 2013-05-25 13:15:00 +02:00
• b05ffb6a89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-24 17:22:20 +02:00
• 95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country gRoussac 2013-05-24 17:21:56 +02:00
• adb0da00f6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Fran�ois Gaillard 2013-05-24 11:39:37 +02:00
• 3b1a9f9f80 [-] BO : Fixed unregistered version field for some modules Fran�ois Gaillard 2013-05-24 11:39:20 +02:00
• 3de79c7015 // same for attributes and attributegroups Rémi Gaillard 2013-05-24 11:33:58 +02:00
• 6f901cea37 [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 Rémi Gaillard 2013-05-24 11:28:07 +02:00
• 3b5f18a96d [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 Rémi Gaillard 2013-05-24 11:28:07 +02:00
• 377eb8435d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-05-24 10:48:15 +02:00
• bc0c8ba2e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-05-24 10:48:15 +02:00
• 220dda354b [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly vAugagneur 2013-05-24 10:47:48 +02:00
• cc79b6a675 [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly vAugagneur 2013-05-24 10:47:48 +02:00
• b6937b243c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-23 16:14:37 +02:00
• a28a8598ba Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-23 16:14:37 +02:00
• 9e2c5bfcb9 [-] BO : Fix bug #PSCFI-6755 "+" in email gRoussac 2013-05-23 16:14:31 +02:00
• 4b64afd4ee [-] BO : Fix bug #PSCFI-6755 "+" in email gRoussac 2013-05-23 16:14:31 +02:00
• 9baeada7a3 Merge pull request #393 from PrestaEdit/patch-33 Vincent Augagneur 2013-05-23 06:25:19 -07:00
• 288e88b183 Merge pull request #393 from PrestaEdit/patch-33 Vincent Augagneur 2013-05-23 06:25:19 -07:00
• 92da1ffa83 //Merged pull request 124 - thanks to @rynge vAugagneur 2013-05-23 15:24:25 +02:00
• 6d0c69a07f //Merged pull request 124 - thanks to @rynge vAugagneur 2013-05-23 15:24:25 +02:00
• b2bb233dc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-23 14:49:20 +02:00
• 2b5d600452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-23 14:49:20 +02:00
• dd2d7491b4 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files gRoussac 2013-05-23 14:49:07 +02:00
• 66fbbf4825 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files gRoussac 2013-05-23 14:49:07 +02:00
• 444f59c9aa Merge pull request #422 from e-gaulue/AuthController_patch Vincent Augagneur 2013-05-23 05:45:05 -07:00
• 56831b9f33 Merge pull request #422 from e-gaulue/AuthController_patch Vincent Augagneur 2013-05-23 05:45:05 -07:00
• c9c458a64c Merge pull request #424 from AntonLejon/patch-3 Vincent Augagneur 2013-05-23 05:33:36 -07:00
• a5f8263c9d Merge pull request #424 from AntonLejon/patch-3 Vincent Augagneur 2013-05-23 05:33:36 -07:00
• bf525275e3 // Updated russian translation of the installer Damien Metzger 2013-05-23 14:29:40 +02:00
• 36acfc1227 // Updated russian translation of the installer Damien Metzger 2013-05-23 14:29:40 +02:00
• 3c73ec5deb Merge pull request #428 from AntonLejon/patch-1 Vincent Augagneur 2013-05-23 05:27:30 -07:00
• bbb24c3d1b Merge pull request #428 from AntonLejon/patch-1 Vincent Augagneur 2013-05-23 05:27:30 -07:00
• f234d847fb Merge pull request #444 from PrestaEdit/patch-38 Vincent Augagneur 2013-05-23 05:21:11 -07:00
• dd363be433 Merge pull request #444 from PrestaEdit/patch-38 Vincent Augagneur 2013-05-23 05:21:11 -07:00
• a57003749b [-] IN : updated support phone number and website in the installer Damien Metzger 2013-05-23 14:11:13 +02:00
• affca31558 [-] IN : updated support phone number and website in the installer Damien Metzger 2013-05-23 14:11:13 +02:00
• 478dd0d39d [-] Core : fixed URL regexp #PSCFV-8986 Damien Metzger 2013-05-23 12:13:28 +02:00
• 9e7d2ac9c7 [-] Core : fixed URL regexp #PSCFV-8986 Damien Metzger 2013-05-23 12:13:28 +02:00
• d8f1226bd7 // Added error reporting level in dev mode Damien Metzger 2013-05-23 10:50:22 +02:00
• c6ab6005f5 // Added error reporting level in dev mode Damien Metzger 2013-05-23 10:50:22 +02:00
• 8d012e30d4 // Inverted 2 steps in the installer Damien Metzger 2013-05-22 16:54:34 +02:00
• 0b503a0c8b // Inverted 2 steps in the installer Damien Metzger 2013-05-22 16:54:34 +02:00
• 5fed3e99e0 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer Rémi Gaillard 2013-05-22 15:46:30 +02:00
• de945adf79 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer Rémi Gaillard 2013-05-22 15:46:30 +02:00
• 4f8b73ef9d //small fix vAugagneur 2013-05-22 14:38:39 +02:00
• 487c567224 //small fix vAugagneur 2013-05-22 14:38:39 +02:00
• da109d56f6 Merge pull request #447 from djfm/development Rémi Gaillard 2013-05-22 05:14:50 -07:00
• 1ab6befe0d Merge pull request #447 from djfm/development Rémi Gaillard 2013-05-22 05:14:50 -07:00
• 2590465a7c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate gRoussac 2013-05-22 12:29:20 +02:00
• f0abc2298c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate gRoussac 2013-05-22 12:29:20 +02:00
• 7f65d01692 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-22 12:16:54 +02:00
• d1904e7c56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-22 12:16:54 +02:00
• 62cbee150b [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); gRoussac 2013-05-22 12:16:27 +02:00
• 7713e86efc [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); gRoussac 2013-05-22 12:16:27 +02:00
• da2db7d799 // parse error djfm 2013-05-22 11:11:37 +02:00
• 5b250dbe8d // parse error djfm 2013-05-22 11:11:37 +02:00
• 0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 Rémi Gaillard 2013-05-22 10:42:35 +02:00
• c7a056f301 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 Rémi Gaillard 2013-05-22 10:42:35 +02:00
• fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 Rémi Gaillard 2013-05-22 10:30:57 +02:00
• b65423f232 [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 Rémi Gaillard 2013-05-22 10:30:57 +02:00
• 41184dac33 // 1.4.9.1 does not exists gRoussac 2013-05-22 09:41:00 +02:00
• 9196ec042e // 1.4.9.1 does not exists gRoussac 2013-05-22 09:41:00 +02:00
• 949333c1c4 // reduondant call to p1540_add_missing_columns gRoussac 2013-05-21 17:36:25 +02:00
• 3879897f38 // reduondant call to p1540_add_missing_columns gRoussac 2013-05-21 17:36:25 +02:00
• 65123157fc [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 gRoussac 2013-05-21 17:20:13 +02:00
• a4c150d2fb [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 gRoussac 2013-05-21 17:20:13 +02:00
• b64cf50391 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 gRoussac 2013-05-21 17:05:12 +02:00
• d6c1a2f038 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 gRoussac 2013-05-21 17:05:12 +02:00
• 93e3ac23ff [-] INSTALLER : SQL error during upgrade from 1.5.0.9 gRoussac 2013-05-21 16:47:53 +02:00
• 9b8bfe1bbc [-] INSTALLER : SQL error during upgrade from 1.5.0.9 gRoussac 2013-05-21 16:47:53 +02:00
• 58acc64ed8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-21 16:29:48 +02:00
• 2f660b70b2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-21 16:29:48 +02:00
• f6ccbb0080 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array gRoussac 2013-05-21 16:29:26 +02:00
• 22ba79eb10 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array gRoussac 2013-05-21 16:29:26 +02:00
• 5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 Rémi Gaillard 2013-05-21 15:25:58 +02:00
• 2542e97164 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 Rémi Gaillard 2013-05-21 15:25:58 +02:00
• f5828aa49a // use getModuleIdByName() PrestaEdit 2013-05-21 13:11:41 +02:00
• 446abf7e3f // use getModuleIdByName() PrestaEdit 2013-05-21 13:11:41 +02:00
• 770d925729 [*] Class: Module / Use method instead of SQL query PrestaEdit 2013-05-21 13:03:41 +03:00