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

• 4783cb17c5 ";" in wrong place ldecoker 2013-04-16 18:34:20 +03:00
• 205e21ba16 [*] BO : Add block "override_form_extra" in helper ccauw 2013-04-16 16:21:23 +03:00
• f7ef4e0350 [*] BO : Add block "override_form_extra" in helper ccauw 2013-04-16 16:21:23 +03:00
• dc529264e0 Merge pull request #366 from kluevandrew/patch-2 Vincent Augagneur 2013-04-16 06:13:48 -07:00
• 1a795cfe4a Merge pull request #366 from kluevandrew/patch-2 Vincent Augagneur 2013-04-16 06:13:48 -07:00
• e5508af99a [*] BO : Add block "override_form_extra" ccauw 2013-04-16 16:09:26 +03:00
• 5b13f6aa7e [*] BO : Add block "override_form_extra" ccauw 2013-04-16 16:09:26 +03:00
• 0f98ff12e1 [-] FO : empty cache getContextualValue_ when updating cart quantity gRoussac 2013-04-16 15:00:24 +02:00
• 47c118c3ca [-] FO : empty cache getContextualValue_ when updating cart quantity gRoussac 2013-04-16 15:00:24 +02:00
• 517a968db7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-04-16 14:14:36 +02:00
• 22694898df Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-04-16 14:14:36 +02:00
• 3d8b28ac93 [-] BO: Fix admin carts currency prices on view and listing Rémi Gaillard 2013-04-16 14:14:04 +02:00
• 96ee6386c1 [-] BO: Fix admin carts currency prices on view and listing Rémi Gaillard 2013-04-16 14:14:04 +02:00
• 0c85403f13 [-] FO : Disable confirm order when already clicked gRoussac 2013-04-16 14:09:37 +02:00
• ce02baf658 [-] FO : Disable confirm order when already clicked gRoussac 2013-04-16 14:09:37 +02:00
• f6d97ea7bb [-] FO : address alias lost gRoussac 2013-04-16 14:08:51 +02:00
• abbdb4d165 [-] FO : address alias lost gRoussac 2013-04-16 14:08:51 +02:00
• 05410d764c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-16 12:17:34 +02:00
• 48390eed96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-16 12:17:34 +02:00
• b95e8e0bc9 [-] BO : Remove typo in address formating fields links gRoussac 2013-04-16 12:15:31 +02:00
• efb90cb0a6 [-] BO : Remove typo in address formating fields links gRoussac 2013-04-16 12:15:31 +02:00
• 7bb98b16f3 [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here Rémi Gaillard 2013-04-16 12:01:04 +02:00
• 8c5143de9e [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here Rémi Gaillard 2013-04-16 12:01:04 +02:00
• 6aa2490915 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-16 11:48:26 +02:00
• b1b71c0c07 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-16 11:48:26 +02:00
• e271524cc4 Merged Pull request #302 - Thanks to @kpodemski vAugagneur 2013-04-16 11:48:17 +02:00
• 7c626218df Merged Pull request #302 - Thanks to @kpodemski vAugagneur 2013-04-16 11:48:17 +02:00
• 3615c225b3 // small change on quantity_per_user cart rule created on ValidateOrder gRoussac 2013-04-16 11:44:09 +02:00
• 62fd5c6195 // small change on quantity_per_user cart rule created on ValidateOrder gRoussac 2013-04-16 11:44:09 +02:00
• dface458a9 Remove spaces before and after dot Andrew 2013-04-16 13:43:24 +04:00
• 5ab4c18396 Remove spaces before and after dot Andrew 2013-04-16 13:43:24 +04:00
• 03eadb3d6a Remove spaces before and after dot Andrew 2013-04-16 13:39:42 +04:00
• a93cfbec07 Remove spaces before and after dot Andrew 2013-04-16 13:39:42 +04:00
• 621ca4a29b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-16 11:35:33 +02:00
• 70176f07e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-16 11:35:33 +02:00
• 5757e56864 Merged Pull request #303 - Thanks to @kpodemski vAugagneur 2013-04-16 11:35:27 +02:00
• 661ddd7548 Merged Pull request #303 - Thanks to @kpodemski vAugagneur 2013-04-16 11:35:27 +02:00
• 3db7204f9c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-16 11:28:42 +02:00
• c0ae0c9b28 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-16 11:28:42 +02:00
• 50cd001d39 [-] FO : Undefined free_shipping in POC when updateQty gRoussac 2013-04-16 11:28:22 +02:00
• f2bdb73d39 [-] FO : Undefined free_shipping in POC when updateQty gRoussac 2013-04-16 11:28:22 +02:00
• 30c9885624 Merge pull request #387 from ccauw/patch-4 Vincent Augagneur 2013-04-16 02:23:04 -07:00
• df60120d5f Merge pull request #387 from ccauw/patch-4 Vincent Augagneur 2013-04-16 02:23:04 -07:00
• de7dc3faf6 // remove additionnal /t gRoussac 2013-04-16 10:53:08 +02:00
• b2f5ed838d // remove additionnal /t gRoussac 2013-04-16 10:53:08 +02:00
• 5290a3edcb [*] FO : add steps to authentication pull request 002f468958 thanks to radovanx gRoussac 2013-04-16 10:51:16 +02:00
• a4d86f14da [*] FO : add steps to authentication pull request 002f468958 thanks to radovanx gRoussac 2013-04-16 10:51:16 +02:00
• 188cddb465 [-] Fo : Fix big pic alt with jqzoom gRoussac 2013-04-16 10:22:46 +02:00
• 6cdf8babca [-] Fo : Fix big pic alt with jqzoom gRoussac 2013-04-16 10:22:46 +02:00
• 6e58a24325 [*] BO : Add block "close_td" in list_content.tpl ccauw 2013-04-15 20:19:10 +03:00
• 7711c710d4 [*] BO : Add block "close_td" in list_content.tpl ccauw 2013-04-15 20:19:10 +03:00
• d0ae9a5a46 [-] FO : Class free order name for validateOrder gRoussac 2013-04-15 18:51:41 +02:00
• 00d7d78ba6 [-] FO : Class free order name for validateOrder gRoussac 2013-04-15 18:51:41 +02:00
• be6b938258 [-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers gRoussac 2013-04-15 18:30:41 +02:00
• eca4a87082 [-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers gRoussac 2013-04-15 18:30:41 +02:00
• c83bc07f20 [-] BO : Remove undefined name when module can not be installed gRoussac 2013-04-15 16:21:03 +02:00
• 5989481859 [-] BO : Remove undefined name when module can not be installed gRoussac 2013-04-15 16:21:03 +02:00
• eafaf2de03 // small changes in installer Rémi Gaillard 2013-04-15 14:33:20 +02:00
• 23b70c4906 // small changes in installer Rémi Gaillard 2013-04-15 14:33:20 +02:00
• 1bfe494e05 [-] Installer : do not select activity if not defined gRoussac 2013-04-15 13:42:57 +02:00
• df111c0662 [-] Installer : do not select activity if not defined gRoussac 2013-04-15 13:42:57 +02:00
• dc2e2d0adf // remove sql parse error gRoussac 2013-04-15 12:10:27 +02:00
• bf90c8cf84 // remove sql parse error gRoussac 2013-04-15 12:10:27 +02:00
• 22b506dd41 [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically gRoussac 2013-04-15 11:48:27 +02:00
• 047551952e [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically gRoussac 2013-04-15 11:48:27 +02:00
• 7fddcd3f38 [-] BO: Don't delete the directory of modules before upgrade them Rémi Gaillard 2013-04-15 11:17:17 +02:00
• 7a89d0596f [-] BO: Don't delete the directory of modules before upgrade them Rémi Gaillard 2013-04-15 11:17:17 +02:00
• 5d3f48354b [-] FO : add cart rul when cart rul has several groups gRoussac 2013-04-12 18:03:38 +02:00
• 0256ee7c59 [-] FO : add cart rul when cart rul has several groups gRoussac 2013-04-12 18:03:38 +02:00
• d907e52a92 // small css fix gRoussac 2013-04-12 17:17:23 +02:00
• cf874a832a // small css fix gRoussac 2013-04-12 17:17:23 +02:00
• 60a787e4cb // small css fix gRoussac 2013-04-12 16:51:05 +02:00
• bd0e467c97 // small css fix gRoussac 2013-04-12 16:51:05 +02:00
• 29a919c24f [-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule gRoussac 2013-04-12 16:45:54 +02:00
• 0ba0a25f3d [-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule gRoussac 2013-04-12 16:45:54 +02:00
• 20901e5c85 Update AdminThemesController.php Daniel 2013-04-12 18:51:50 +08:00
• 7f5a78a120 Update AdminThemesController.php Daniel 2013-04-12 18:51:50 +08:00
• b9ca25d3e6 [-] Fo : Fix undefined var in cart-summary when updating id_address_delivery gRoussac 2013-04-12 12:34:37 +02:00
• f209d5a669 [-] Fo : Fix undefined var in cart-summary when updating id_address_delivery gRoussac 2013-04-12 12:34:37 +02:00
• b7546a6ad2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-12 12:04:21 +02:00
• a73c09ab4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-12 12:04:21 +02:00
• 5b48649242 [-] FO : Fix login cookie issues gRoussac 2013-04-12 12:03:16 +02:00
• fcce2d2737 [-] FO : Fix login cookie issues gRoussac 2013-04-12 12:03:16 +02:00
• 03262debd4 //Merge Pull request #319 vAugagneur 2013-04-12 11:55:57 +02:00
• d48d33fc43 //Merge Pull request #319 vAugagneur 2013-04-12 11:55:57 +02:00
• 7e3640e3b7 [-] FO: fixed bug #PSCFV-3238 - compareController typo sLorenzini 2013-04-12 11:50:52 +02:00
• 9060661cef [-] FO: fixed bug #PSCFV-3238 - compareController typo sLorenzini 2013-04-12 11:50:52 +02:00
• 329ff2fe39 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-12 11:46:44 +02:00
• 37296f9c7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-12 11:46:44 +02:00
• 846d6c489d //small spellchecking vAugagneur 2013-04-12 11:46:38 +02:00
• f0209dd447 //small spellchecking vAugagneur 2013-04-12 11:46:38 +02:00
• a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image sLorenzini 2013-04-12 11:45:23 +02:00
• 1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image sLorenzini 2013-04-12 11:45:23 +02:00
• a89c8964b5 Merge pull request #346 from pxls/patch-1 Vincent Augagneur 2013-04-12 02:42:24 -07:00
• 8609f07749 Merge pull request #346 from pxls/patch-1 Vincent Augagneur 2013-04-12 02:42:24 -07:00
• 4a1892843a [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch Rémi Gaillard 2013-04-12 11:39:56 +02:00
• 305cf4dd9c [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch Rémi Gaillard 2013-04-12 11:39:56 +02:00
• f8dd047f99 Merge pull request #371 from PrestaEdit/patch-26 Vincent Augagneur 2013-04-12 01:50:54 -07:00
• e8f3fcf581 Merge pull request #371 from PrestaEdit/patch-26 Vincent Augagneur 2013-04-12 01:50:54 -07:00
• f30749449f // fix for commit 3cbd8444d6 Rémi Gaillard 2013-04-12 10:49:30 +02:00