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

• 45f54ce08d Merge pull request #402 from djfm/release Damien Metzger 2013-04-25 02:17:35 -07:00
• 1d8c2f84c3 [-] FO : do not use dispatcher routes for static files Damien Metzger 2013-04-25 11:06:54 +02:00
• 35d3d1d6c5 [-] FO : do not use dispatcher routes for static files Damien Metzger 2013-04-25 11:06:54 +02:00
• 2b23268bec [-] BO: Fix htaccess generation for subfolders installation Rémi Gaillard 2013-04-25 11:04:48 +02:00
• e827d3355d [-] BO: Fix htaccess generation for subfolders installation Rémi Gaillard 2013-04-25 11:04:48 +02:00
• a7986efda1 Send mail with the shop in the context Cédric Mouleyre 2013-04-25 11:59:25 +03:00
• bf40d68098 Send mail with the shop in the context Cédric Mouleyre 2013-04-25 11:59:25 +03:00
• ac9a5c5a41 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 vAugagneur 2013-04-25 10:59:18 +02:00
• 1280152db9 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 vAugagneur 2013-04-25 10:59:18 +02:00
• d0f230da39 [*] TR : Removed hard-coded dot in history.tpl djfm 2013-04-25 10:48:29 +02:00
• f7f137fec1 [*] TR : Removed hard-coded dot in history.tpl djfm 2013-04-25 10:48:29 +02:00
• 89723f9daf Double 'id_image' definition in product getList Cédric Mouleyre 2013-04-25 11:31:10 +03:00
• e344863a3c Double 'id_image' definition in product getList Cédric Mouleyre 2013-04-25 11:31:10 +03:00
• e664335f4d [*] TR : Improved English text of installer djfm 2013-04-25 10:24:13 +02:00
• 8f406fcd1d [*] TR : Improved English text of installer djfm 2013-04-25 10:24:13 +02:00
• 91ab0362db [-] BO : Fix bug witth shop address and no state in country gRoussac 2013-04-25 10:12:23 +02:00
• 125884d8c0 [-] BO : Fix bug witth shop address and no state in country gRoussac 2013-04-25 10:12:23 +02:00
• 7a76b8b6a0 // Removed deprecated block for new installs Damien Metzger 2013-04-25 09:03:32 +02:00
• b2b17eb041 // Removed deprecated block for new installs Damien Metzger 2013-04-25 09:03:32 +02:00
• 0e9a4a8272 // Changed default value of checkbox in install Damien Metzger 2013-04-25 08:41:16 +02:00
• 08f6d1a670 // Changed default value of checkbox in install Damien Metzger 2013-04-25 08:41:16 +02:00
• 9a326bd844 // Also update the tax display for unidentified and guest group on localization import Rémi Gaillard 2013-04-24 19:01:10 +02:00
• 5a3c2aa5cf // Also update the tax display for unidentified and guest group on localization import Rémi Gaillard 2013-04-24 19:01:10 +02:00
• c6710bf26f // Switch iframe to https Damien Metzger 2013-04-24 18:31:51 +03:00
• cc2df5b237 // Switch iframe to https Damien Metzger 2013-04-24 18:31:51 +03:00
• 7081e6d0d0 [-] BO : Fix bug for csv export gRoussac 2013-04-24 17:29:36 +02:00
• 1975755d8a [-] BO : Fix bug for csv export gRoussac 2013-04-24 17:29:36 +02:00
• 2c3f2eb1da //new addons url in install process Francois Gaillard 2013-04-19 11:44:29 +02:00
• 5967c6ebbe //new addons url in install process vAugagneurandFrançois Gaillard 2013-04-19 11:44:29 +02:00
• 50d52baa7b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-04-24 16:38:31 +02:00
• b5047051cd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-04-24 16:38:31 +02:00
• 4df54ce743 // Fixed warning in translations Damien Metzger 2013-04-24 16:27:45 +02:00
• 7cafc7bdf5 // Fixed warning in translations Damien Metzger 2013-04-24 16:27:45 +02:00
• 71f0986535 // Small translation fix Damien Metzger 2013-04-24 15:45:58 +02:00
• feb1edc076 // Small translation fix Damien Metzger 2013-04-24 15:45:58 +02:00
• 64684fe6c9 // Small fix translations Damien Metzger 2013-04-24 15:29:00 +02:00
• 75dd65f207 // Small fix translations Damien Metzger 2013-04-24 15:29:00 +02:00
• fd23578e1a Merge pull request #305 from Prestaworks/patch-9 Vincent Augagneur 2013-04-24 01:29:58 -07:00
• ec45ea725f Merge pull request #305 from Prestaworks/patch-9 Vincent Augagneur 2013-04-24 01:29:58 -07:00
• 3948903884 // Write theme translations... in the theme Damien Metzger 2013-04-24 10:29:02 +02:00
• 83f132aa78 // Write theme translations... in the theme Damien Metzger 2013-04-24 10:29:02 +02:00
• 9eb84825a6 // Fix module translation in the core Damien Metzger 2013-04-23 20:25:28 +02:00
• d16f30f322 // Fix module translation in the core Damien Metzger 2013-04-23 20:25:28 +02:00
• 2c802ad4ec // Fix translation behavior Vincent Terenti 2013-04-23 19:10:31 +02:00
• 2d1a4ed180 // Fix translation behavior Vincent Terenti 2013-04-23 19:10:31 +02:00
• 3607c2264f [-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back vAugagneur 2013-04-23 17:41:29 +02:00
• 05fd9aeaae [-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back vAugagneur 2013-04-23 17:41:29 +02:00
• c7bbf74913 //small fix on Link::getProductLink() vAugagneur 2013-04-23 17:33:15 +02:00
• cc18fd1de6 //small fix on Link::getProductLink() vAugagneur 2013-04-23 17:33:15 +02:00
• 6f96f0ac9a [-] FO : invoice: do not display taxes table if there is not tax to display Damien Metzger 2013-04-23 16:45:52 +02:00
• 318a136553 [-] FO : invoice: do not display taxes table if there is not tax to display Damien Metzger 2013-04-23 16:45:52 +02:00
• 913d0d9711 // small text change Rémi Gaillard 2013-04-23 15:51:30 +02:00
• 697a305848 // small text change Rémi Gaillard 2013-04-23 15:51:30 +02:00
• 9395d95548 [-] FO : Fixed product comparator CSS Damien Metzger 2013-04-23 15:35:21 +02:00
• 8d4723247e [-] FO : Fixed product comparator CSS Damien Metzger 2013-04-23 15:35:21 +02:00
• c191b36fb6 // Fixed Chrome issue with cart rules Damien Metzger 2013-04-23 15:30:17 +02:00
• 4162591e3e // Fixed Chrome issue with cart rules Damien Metzger 2013-04-23 15:30:17 +02:00
• 23dacfd754 // Change link to the documentation in the installer Damien Metzger 2013-04-23 14:57:24 +02:00
• bec335441e // Change link to the documentation in the installer Damien Metzger 2013-04-23 14:57:24 +02:00
• b84b44a44c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-23 14:22:45 +02:00
• 0156ddc30a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-23 14:22:45 +02:00
• ece02e6bf3 Merge Pull Request #167 - Thanks @Zeyckler vAugagneur 2013-04-23 14:22:40 +02:00
• e363dc8759 Merge Pull Request #167 - Thanks @Zeyckler vAugagneur 2013-04-23 14:22:40 +02:00
• 5e9ba185ef Merge pull request #390 from ccauw/patch-7 Vincent Augagneur 2013-04-23 05:20:43 -07:00
• d1c7f9c012 Merge pull request #390 from ccauw/patch-7 Vincent Augagneur 2013-04-23 05:20:43 -07:00
• d8313760ec // Remove "core" for the themes translations in the translation tool Damien Metzger 2013-04-23 12:36:52 +02:00
• 4be1bef203 // Remove "core" for the themes translations in the translation tool Damien Metzger 2013-04-23 12:36:52 +02:00
• 9282e310f4 // add static page to replace white page for exceptions in FO Rémi Gaillard 2013-04-23 11:54:11 +02:00
• ceddfdd8e6 // add static page to replace white page for exceptions in FO Rémi Gaillard 2013-04-23 11:54:11 +02:00
• 2d2b9f76e0 Merge Pull Request #53 - Thanks @Caleydon vAugagneur 2013-04-23 11:40:08 +02:00
• 38eb16eb48 Merge Pull Request #53 - Thanks @Caleydon vAugagneur 2013-04-23 11:40:08 +02:00
• e61bd7c185 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-04-23 11:39:14 +02:00
• f1e34c20b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-04-23 11:39:14 +02:00
• b9a877625c // Fixed warning Damien Metzger 2013-04-23 11:36:13 +02:00
• 13c435a54b // Fixed warning Damien Metzger 2013-04-23 11:36:13 +02:00
• 7ce6502600 // Changed translation tool behavior with dev mode and overrides Damien Metzger 2013-04-23 11:21:10 +02:00
• 4e21c56d1b // Changed translation tool behavior with dev mode and overrides Damien Metzger 2013-04-23 11:21:10 +02:00
• da96eb6651 Merge Pull request #67 - Thanks @Ha99y vAugagneur 2013-04-23 10:02:29 +02:00
• e466ede051 Merge Pull request #67 - Thanks @Ha99y vAugagneur 2013-04-23 10:02:29 +02:00
• 18ed37127d Merge Pull Request #21 - thanks @Caleydon vAugagneur 2013-04-23 09:34:24 +02:00
• 5b7da618b5 Merge Pull Request #21 - thanks @Caleydon vAugagneur 2013-04-23 09:34:24 +02:00
• d8453cccfb Merge pull request #398 from djfm/release Rémi Gaillard 2013-04-22 09:42:39 -07:00
• 75fed1a2cc Merge pull request #398 from djfm/release Rémi Gaillard 2013-04-22 09:42:39 -07:00
• 88dce29e32 [*] TR : added russian installer tabs djfm 2013-04-22 18:37:28 +02:00
• da1f92b85b [*] TR : added russian installer tabs djfm 2013-04-22 18:37:28 +02:00
• 4adc9f2ccf Merge pull request #397 from djfm/release Rémi Gaillard 2013-04-22 08:46:15 -07:00
• cd079f7a1a Merge pull request #397 from djfm/release Rémi Gaillard 2013-04-22 08:46:15 -07:00
• 19ce381cba [*] TR : Fixed wrong use of translation functions in AdminTranslationsController djfm 2013-04-22 17:24:47 +02:00
• 0da1eb9e35 [*] TR : Fixed wrong use of translation functions in AdminTranslationsController djfm 2013-04-22 17:24:47 +02:00
• 260dd12edd Merge pull request #396 from djfm/installer_tabs Damien Metzger 2013-04-22 07:01:40 -07:00
• 38adc4aaf3 Merge pull request #396 from djfm/installer_tabs Damien Metzger 2013-04-22 07:01:40 -07:00
• 6a70093416 [*] TR : Added tab translations for installer languages djfm 2013-04-22 15:40:25 +02:00
• 7912aba499 [*] TR : Added tab translations for installer languages djfm 2013-04-22 15:40:25 +02:00
• 3d6d97af5f [*] BO : added new button on manufacturers view vAugagneur 2013-04-22 14:56:59 +02:00
• 5fb2bb9ee2 [*] BO : added new button on manufacturers view vAugagneur 2013-04-22 14:56:59 +02:00
• bcdb85c309 [*] FO : one_phone_at_least should be set gRoussac 2013-04-22 12:18:26 +02:00
• 59ab9b63cf [*] FO : one_phone_at_least should be set gRoussac 2013-04-22 12:18:26 +02:00
• 5be95a8a98 [-] Fo : Remove additionnal space in phone field value gRoussac 2013-04-18 19:43:04 +02:00
• 90bf119624 [-] Fo : Remove additionnal space in phone field value gRoussac 2013-04-18 19:43:04 +02:00
• 58884b2da7 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO gRoussac 2013-04-18 19:12:07 +02:00