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

• 116df3b3fd [-] 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
• d8b39d060d [*] FO : one_phone_at_least should be set gRoussac 2013-04-22 12:18:26 +02:00
• 34688d6933 [*] FO : one_phone_at_least should be set gRoussac 2013-04-22 12:18:26 +02:00
• c5ed733cfc [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state gRoussac 2013-04-22 12:09:35 +02:00
• 4bf41c590b [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state gRoussac 2013-04-22 12:09:35 +02:00
• aead567def Merged Pull request #355 - thanks to @bibendi vAugagneur 2013-04-22 12:06:19 +02:00
• 31e7c6a08e Merged Pull request #355 - thanks to @bibendi vAugagneur 2013-04-22 12:06:19 +02:00
• e7b22ad8d4 // Fixed a few UI bugs in the stats Damien Metzger 2013-04-22 11:57:36 +02:00
• 141772725b // Fixed a few UI bugs in the stats Damien Metzger 2013-04-22 11:57:36 +02:00
• 6b8c3d8612 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-22 11:34:02 +02:00
• fd46c87786 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-22 11:34:02 +02:00
• 1acd07e063 [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks gRoussac 2013-04-22 11:33:13 +02:00
• 34a2c0191c [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks gRoussac 2013-04-22 11:33:13 +02:00
• 20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists Rémi Gaillard 2013-04-22 10:50:41 +02:00
• 7c4a188ae8 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists Rémi Gaillard 2013-04-22 10:50:41 +02:00
• c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs Vincent Augagneur 2013-04-22 01:18:15 -07:00
• 7c43ae05fc Merge pull request #123 from rynge/admin_category_breadcrumbs Vincent Augagneur 2013-04-22 01:18:15 -07:00
• ec051deb31 [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger vAugagneur 2013-04-22 09:48:30 +02:00
• b1a839263d [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger vAugagneur 2013-04-22 09:48:30 +02:00
• 50528a5fe3 [*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger vAugagneur 2013-04-22 09:40:48 +02:00
• 5f6d0614df [*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger vAugagneur 2013-04-22 09:40:48 +02:00
• c96b4ca248 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by Rémi Gaillard 2013-04-19 15:48:18 +02:00
• 16906d8590 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by Rémi Gaillard 2013-04-19 15:48:18 +02:00
• 9c1bf63ab9 // fix display of accessories for products without combinations Rémi Gaillard 2013-04-19 15:15:25 +02:00
• cc3f9212ac // fix display of accessories for products without combinations Rémi Gaillard 2013-04-19 15:15:25 +02:00
• ba7f9620c3 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-04-19 15:14:51 +02:00
• 236675544b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-04-19 15:14:51 +02:00
• 2cde30c118 //new addons url in install process vAugagneur 2013-04-19 11:44:29 +02:00
• 22135487ab //new addons url in install process vAugagneur 2013-04-19 11:44:29 +02:00
• ce44e9a95c [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent vAugagneur 2013-04-19 11:07:59 +02:00
• da4c87d9ba [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent vAugagneur 2013-04-19 11:07:59 +02:00
• 6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper gRoussac 2013-04-19 10:34:20 +02:00
• f93c7ec8c7 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper gRoussac 2013-04-19 10:34:20 +02:00
• 17536ff682 // Fixed potential warning Damien Metzger 2013-04-18 17:12:59 -03:00
• 54b75b9818 // Fixed potential warning Damien Metzger 2013-04-18 17:12:59 -03:00
• c4ae13af75 // Changed link to documentation in the installer Damien Metzger 2013-04-18 16:57:05 -03:00
• 65c1198480 // Changed link to documentation in the installer Damien Metzger 2013-04-18 16:57:05 -03:00
• bfbc46cf51 // Removed useless message Damien Metzger 2013-04-18 16:53:27 -03:00
• 29c0761645 // Removed useless message Damien Metzger 2013-04-18 16:53:27 -03:00
• 550ee435e8 // Fixed truncate / escape order Damien Metzger 2013-04-18 16:39:33 -03:00
• b1000d63b9 // Fixed truncate / escape order Damien Metzger 2013-04-18 16:39:33 -03:00
• b840b6bd2b [-] Fo : Remove additionnal space in phone field value gRoussac 2013-04-18 19:43:04 +02:00
• 62836d65ab [-] Fo : Remove additionnal space in phone field value gRoussac 2013-04-18 19:43:04 +02:00
• 65a73c7d4b [-] 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
• e2905ca845 [-] 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
• 8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-04-18 18:23:18 +02:00
• b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-04-18 18:23:18 +02:00
• dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop gRoussac 2013-04-18 17:28:16 +02:00
• 1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop gRoussac 2013-04-18 17:28:16 +02:00
• 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 Rémi Gaillard 2013-04-18 17:12:05 +02:00
• 38bdd421f7 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 Rémi Gaillard 2013-04-18 17:12:05 +02:00
• ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-18 17:02:51 +02:00
• 803447b88d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-18 17:02:51 +02:00
• 75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller vAugagneur 2013-04-18 17:02:45 +02:00
• 828ffb74ad [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller vAugagneur 2013-04-18 17:02:45 +02:00
• 2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping gRoussac 2013-04-18 16:44:55 +02:00
• e22fe455b3 [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping gRoussac 2013-04-18 16:44:55 +02:00
• b52c71c7ad [-] BO - fixed bug #PSCFV-8614 vAugagneur 2013-04-18 15:14:37 +02:00
• e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 vAugagneur 2013-04-18 15:14:37 +02:00
• 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-04-18 14:59:02 +02:00
• 53cc380a6a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-04-18 14:59:02 +02:00
• a7be6b14e8 //AdminModulesController::extractArchive() now return something Rémi Gaillard 2013-04-18 14:58:43 +02:00
• 986d57148f //AdminModulesController::extractArchive() now return something Rémi Gaillard 2013-04-18 14:58:43 +02:00
• 0a8eddf7d6 [-] BO : Bad gender image when no gender gRoussac 2013-04-18 14:54:12 +02:00
• ccfa343b0d [-] BO : Bad gender image when no gender gRoussac 2013-04-18 14:54:12 +02:00
• f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 Rémi Gaillard 2013-04-18 14:24:50 +02:00
• ab700a6285 [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 Rémi Gaillard 2013-04-18 14:24:50 +02:00
• f7a1fdb9e0 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float Rémi Gaillard 2013-04-18 14:21:44 +02:00
• 158ab771b6 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float Rémi Gaillard 2013-04-18 14:21:44 +02:00
• e7b344adab // don't try to clear smarty cache if smarty is not defined Rémi Gaillard 2013-04-18 14:06:49 +02:00
• 5edfd03068 // don't try to clear smarty cache if smarty is not defined Rémi Gaillard 2013-04-18 14:06:49 +02:00
• bc07b025c1 [-] MO: feeder / RSS Valid PrestaEdit 2013-04-18 14:45:52 +03:00
• df1b8efbc2 [-] MO: feeder / RSS Valid PrestaEdit 2013-04-18 14:45:52 +03:00
• c9a53bf491 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-04-18 12:09:47 +02:00
• 768eb473e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-04-18 12:09:47 +02:00
• be250c9ecc // Revert a93cfbec07 Rémi Gaillard 2013-04-18 11:36:55 +02:00
• f0c5407aa6 // Revert a93cfbec07 Rémi Gaillard 2013-04-18 11:36:55 +02:00
• 5a815e7b19 [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC gRoussac 2013-04-18 11:26:50 +02:00
• ee3e2ac6dc [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC gRoussac 2013-04-18 11:26:50 +02:00
• 859175dde1 [-] FO: fixed some css bug for ie7 sLorenzini 2013-04-18 11:22:40 +02:00
• b633b44ac7 [-] FO: fixed some css bug for ie7 sLorenzini 2013-04-18 11:22:40 +02:00
• 39e3b079dd [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 Rémi Gaillard 2013-04-17 18:14:58 +02:00
• 5ba3fda95f [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 Rémi Gaillard 2013-04-17 18:14:58 +02:00
• a172632600 // Fix smarty cache after modules translation update Rémi Gaillard 2013-04-17 14:44:20 +02:00
• f83b91ae51 // Fix smarty cache after modules translation update Rémi Gaillard 2013-04-17 14:44:20 +02:00
• 76f584a70d // pscleaner clean address inversion between customers and manufacturers/suppliers Rémi Gaillard 2013-04-17 11:39:11 +02:00
• 49ff8ae4a1 // pscleaner clean address inversion between customers and manufacturers/suppliers Rémi Gaillard 2013-04-17 11:39:11 +02:00
• 95500d708d Merge pull request #179 from nturato/patch-1 Vincent Augagneur 2013-04-17 01:56:57 -07:00
• 34f2ff36a3 Merge pull request #179 from nturato/patch-1 Vincent Augagneur 2013-04-17 01:56:57 -07:00
• 6bf1d0c036 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-17 10:02:37 +02:00
• de0ef82f74 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-17 10:02:37 +02:00
• 9f9562f92b Merge Pull request #98 - Thanks to @phproberto vAugagneur 2013-04-17 10:02:32 +02:00
• de887cc078 Merge Pull request #98 - Thanks to @phproberto vAugagneur 2013-04-17 10:02:32 +02:00
• 27212bd126 [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping gRoussac 2013-04-16 18:56:00 +02:00
• 701d9e50af [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping gRoussac 2013-04-16 18:56:00 +02:00
• 34644ee6eb Update AdminAttributesGroupsController.php ldecoker 2013-04-16 19:17:51 +03:00
• 624fed3710 Update form.tpl ldecoker 2013-04-16 19:15:45 +03:00
• d6b1ae8877 Merge pull request #391 from ldecoker/patch-5 Gregory Roussac 2013-04-16 08:50:45 -07:00
• 5bae95dacc Merge pull request #391 from ldecoker/patch-5 Gregory Roussac 2013-04-16 08:50:45 -07:00
• a40f61e922 ";" in wrong place ldecoker 2013-04-16 18:34:20 +03:00