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

• 496999fb1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-24 10:23:39 +01:00
• 6a6fd9925d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-24 10:23:39 +01:00
• 33f27c2c0b [-] FO : No error on first consultation of shopping cart with minimum purchase gRoussac 2013-01-24 10:22:29 +01:00
• 31e3d9d388 [-] FO : No error on first consultation of shopping cart with minimum purchase gRoussac 2013-01-24 10:22:29 +01:00
• f11faead01 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list sLorenzini 2013-01-24 10:10:42 +01:00
• 5741d450c0 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list sLorenzini 2013-01-24 10:10:42 +01:00
• 4b73d72a65 // parse error in last commit sorry gRoussac 2013-01-24 09:41:35 +01:00
• 290c9fa75c // parse error in last commit sorry gRoussac 2013-01-24 09:41:35 +01:00
• 7b48cdd068 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio gRoussac 2013-01-24 09:28:06 +01:00
• 3c6c352df2 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio gRoussac 2013-01-24 09:28:06 +01:00
• 812f2f1232 [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Redirects) on pages served by https. emily-d 2013-01-23 22:30:18 +01:00
• 82cb9f8ba9 [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Redirects) on pages served by https. emily-d 2013-01-23 22:30:18 +01:00
• 39d7863eac [-] BO : fix css for iframe of custom products when creating order in BO gRoussac 2013-01-23 18:38:00 +01:00
• 7d1e6d993d [-] BO : fix css for iframe of custom products when creating order in BO gRoussac 2013-01-23 18:38:00 +01:00
• 300259661a [-] FO : adding values to empty parameters in ajax of cart-summary.js gRoussac 2013-01-23 18:36:20 +01:00
• f81e0c51fa [-] FO : adding values to empty parameters in ajax of cart-summary.js gRoussac 2013-01-23 18:36:20 +01:00
• 04e436551b [-] Installer: clear the database when an error occured during the install Rémi Gaillard 2013-01-23 17:05:51 +01:00
• d068582ce9 [-] Installer: clear the database when an error occured during the install Rémi Gaillard 2013-01-23 17:05:51 +01:00
• 43290dd47a [-] BO: Fix #PSCFV-7377 customizable fields on product duplication Rémi Gaillard 2013-01-23 16:07:53 +01:00
• c8ecf3d604 [-] BO: Fix #PSCFV-7377 customizable fields on product duplication Rémi Gaillard 2013-01-23 16:07:53 +01:00
• 72c76e3b59 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries gRoussac 2013-01-23 15:48:15 +01:00
• a48d2668d3 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries gRoussac 2013-01-23 15:48:15 +01:00
• d886bf3103 [-] FO: fixed bug css in IE sLorenzini 2013-01-23 15:27:41 +01:00
• f8d5b33251 [-] FO: fixed bug css in IE sLorenzini 2013-01-23 15:27:41 +01:00
• 79860bfa12 [-] WS: Fix #PSCFV-6559 deletion of category images Rémi Gaillard 2013-01-23 15:25:33 +01:00
• 9cb3db42ff [-] WS: Fix #PSCFV-6559 deletion of category images Rémi Gaillard 2013-01-23 15:25:33 +01:00
• 150f8ae528 [-] BO: Fix translations for overridden templates #PSCFV-7391 Rémi Gaillard 2013-01-23 14:58:37 +01:00
• e660265a1c [-] BO: Fix translations for overridden templates #PSCFV-7391 Rémi Gaillard 2013-01-23 14:58:37 +01:00
• 6b2fab87d2 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a Vincent Augagneur 2013-01-23 05:10:20 -08:00
• 9f876f9300 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a Vincent Augagneur 2013-01-23 05:10:20 -08:00
• 5c1f5b0f23 // Synchronized localization files between server and solution djfm 2013-01-23 10:33:32 +01:00
• 877e85cb31 // Synchronized localization files between server and solution djfm 2013-01-23 10:33:32 +01:00
• 60c4d09948 [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 sLorenzini 2013-01-23 09:44:54 +01:00
• bbb1ee896e [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 sLorenzini 2013-01-23 09:44:54 +01:00
• 9cf577ff0d //fixed bug with images when theme don't have associate image type Vincent Augagneur 2013-01-23 09:30:49 +01:00
• 88b6502488 //fixed bug with images when theme don't have associate image type Vincent Augagneur 2013-01-23 09:30:49 +01:00
• 3b2b718f84 [-] MO: fix a problem with the wishlist_link PrestaEdit 2013-01-22 23:50:52 +01:00
• 94c84b41cf [-] MO: fix a problem with the wishlist_link PrestaEdit 2013-01-22 23:50:52 +01:00
• caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in gRoussac 2013-01-22 18:33:14 +01:00
• f5c2d8e826 [-] FO : Try to fix "phone required" bug once again when only signing in gRoussac 2013-01-22 18:33:14 +01:00
• 7a8fade4b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-22 16:33:56 +01:00
• 4b7936bf46 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-22 16:33:56 +01:00
• c0e7444889 [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC gRoussac 2013-01-22 16:32:55 +01:00
• 1ed094abfb [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC gRoussac 2013-01-22 16:32:55 +01:00
• c89ad555df [*] FO oosHook must be a div, not a paragraph Benjamin PONGY 2013-01-22 15:19:52 +01:00
• 0461ae3cd6 [*] FO oosHook must be a div, not a paragraph Benjamin PONGY 2013-01-22 15:19:52 +01:00
• 9e45ad974a [-] BO: Allow override for emails translations on the default theme without MODE_DEV Rémi Gaillard 2013-01-22 15:07:25 +01:00
• 8f80654965 [-] BO: Allow override for emails translations on the default theme without MODE_DEV Rémi Gaillard 2013-01-22 15:07:25 +01:00
• 377cc5d794 Merge pull request #183 from PrestaEdit/patch-8 Vincent Augagneur 2013-01-22 05:49:56 -08:00
• d4247f04b8 Merge pull request #183 from PrestaEdit/patch-8 Vincent Augagneur 2013-01-22 05:49:56 -08:00
• 9c821b3932 Merge pull request #184 from PrestaEdit/patch-9 Vincent Augagneur 2013-01-22 05:49:18 -08:00
• f64cedc1a0 Merge pull request #184 from PrestaEdit/patch-9 Vincent Augagneur 2013-01-22 05:49:18 -08:00
• db3be40c06 Disable search indexation Samy Rabih 2013-01-22 14:34:17 +01:00
• 8e80cdb6b7 Disable search indexation Samy Rabih 2013-01-22 14:34:17 +01:00
• f4c361636e Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development Marco Cervellin 2013-01-22 12:06:25 +01:00
• 94ebf82fd5 Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development Marco Cervellin 2013-01-22 12:06:25 +01:00
• b4864f83f6 Merge pull request #190 from PrestaEdit/patch-13 Vincent Augagneur 2013-01-22 03:02:05 -08:00
• 7cb6f55193 Merge pull request #190 from PrestaEdit/patch-13 Vincent Augagneur 2013-01-22 03:02:05 -08:00
• 1fb06bc07d [-] FO : fixed smarty curly bracket Marco Cervellin 2013-01-22 11:53:29 +01:00
• 373e7a8c39 [-] FO : fixed smarty curly bracket Marco Cervellin 2013-01-22 11:53:29 +01:00
• f47031eaaf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-22 11:28:05 +01:00
• fc547a4ab9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-22 11:28:05 +01:00
• f40ae37a24 [-] Core: check the existence of the overriden emails templates before try to sending them Rémi Gaillard 2013-01-22 11:27:51 +01:00
• f1f8ce993f [-] Core: check the existence of the overriden emails templates before try to sending them Rémi Gaillard 2013-01-22 11:27:51 +01:00
• 459ce4fab8 [-] CORE : email with virtual products info was not send to the customer vAugagneur 2013-01-22 11:23:05 +01:00
• 262431e0e0 [-] CORE : email with virtual products info was not send to the customer vAugagneur 2013-01-22 11:23:05 +01:00
• 268b581953 Merge pull request #209 from Patanock/patch-3 Vincent Augagneur 2013-01-22 00:19:49 -08:00
• 691b2039d3 Merge pull request #209 from Patanock/patch-3 Vincent Augagneur 2013-01-22 00:19:49 -08:00
• 7f56058619 [*] BO: we don't need to clik on a line PrestaEdit 2013-01-21 22:23:51 +01:00
• 6903d9ea62 [*] BO: we don't need to clik on a line PrestaEdit 2013-01-21 22:23:51 +01:00
• 1514263b35 Update classes/module/Module.php Patanock 2013-01-21 20:28:59 +01:00
• 7432db7fad Update classes/module/Module.php Patanock 2013-01-21 20:28:59 +01:00
• 378320854c // typo fix Rémi Gaillard 2013-01-21 18:42:56 +01:00
• 2652130ca4 // typo fix Rémi Gaillard 2013-01-21 18:42:56 +01:00
• d96d6a46d1 Update classes/module/Module.php Patanock 2013-01-21 17:53:29 +01:00
• 7d1bed8407 Update classes/module/Module.php Patanock 2013-01-21 17:53:29 +01:00
• 517e90da43 [+] BO : new display of module list in all BO tabs vAugagneur 2013-01-21 17:46:40 +01:00
• 4523f4c849 [+] BO : new display of module list in all BO tabs vAugagneur 2013-01-21 17:46:40 +01:00
• a70e92dced [-] Core: Store partial value in OrderCartRules #PSCFV-6566 Rémi Gaillard 2013-01-21 17:33:35 +01:00
• dffd143e0f [-] Core: Store partial value in OrderCartRules #PSCFV-6566 Rémi Gaillard 2013-01-21 17:33:35 +01:00
• 1915ea63a7 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager Rémi Gaillard 2013-01-21 16:32:31 +01:00
• 935b5b5d02 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager Rémi Gaillard 2013-01-21 16:32:31 +01:00
• ad9543fc53 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-21 15:41:42 +01:00
• c45345b36a [-] BO: description_short product field validation when the limit is changed #PSCFV-7383 Rémi Gaillard 2013-01-21 15:42:58 +01:00
• ebc3d2562f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-21 15:41:42 +01:00
• 3dbf875923 [-] BO: description_short product field validation when the limit is changed #PSCFV-7383 Rémi Gaillard 2013-01-21 15:42:58 +01:00
• 17be5368c7 [*] BO : Fix #PSCFI-6225 for 1.5.X gRoussac 2013-01-21 15:41:13 +01:00
• 1de477a77b [*] BO : Fix #PSCFI-6225 for 1.5.X gRoussac 2013-01-21 15:41:13 +01:00
• b6c2532c8f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-21 15:31:44 +01:00
• b3868c74d6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-21 15:31:44 +01:00
• 00702ba1e2 [-] FO : small fix on shopping cart adresses gRoussac 2013-01-21 15:30:31 +01:00
• 5eb4258bac [-] FO : small fix on shopping cart adresses gRoussac 2013-01-21 15:30:31 +01:00
• f56cbc9fa8 [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 sLorenzini 2013-01-21 14:46:54 +01:00
• 0f5638f0fb [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 sLorenzini 2013-01-21 14:46:54 +01:00
• c45107a65f [-] FO: fixed IE8 Adding Address Problem + improve line-height input on IE - #PSCFV-6401 sLorenzini 2013-01-21 11:53:51 +01:00
• d2077289f0 [-] FO: fixed IE8 Adding Address Problem + improve line-height input on IE - #PSCFV-6401 sLorenzini 2013-01-21 11:53:51 +01:00
• b30c355e3c [-] FO: improve display voucher code sLorenzini 2013-01-21 11:10:26 +01:00
• c90c29abaf [-] FO: improve display voucher code sLorenzini 2013-01-21 11:10:26 +01:00
• 29be2ef924 Merge pull request #203 from involic/development Rémi Gaillard 2013-01-21 01:04:28 -08:00
• 6e3f28bdb9 Merge pull request #203 from involic/development Rémi Gaillard 2013-01-21 01:04:28 -08:00