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

• c432c44987 //carrier wizard fix Vincent Augagneur 2013-08-01 11:42:58 +02:00
• bf7c38ef49 //carrier wizard fix Vincent Augagneur 2013-08-01 11:28:53 +02:00
• af9397a11b [-] BO : fixed domain warning Damien Metzger 2013-08-01 10:50:21 +02:00
• ebe8d6294d // CSS fix for carrier wizard Damien Metzger 2013-08-01 09:34:07 +02:00
• 0d7ca1d8cf // Install version ready for 1.5.5 Damien Metzger 2013-08-01 09:21:51 +02:00
• e4878ba393 // I'm not sure as I've never had a look at how that works before ;) Kevin Granger 2013-07-31 21:17:03 +02:00
• 168759a383 // Stock performance optimization Damien Metzger 2013-07-31 18:40:11 +02:00
• e930d40482 // Added debug function Tools::debug_backtrace() Damien Metzger 2013-07-31 18:30:17 +02:00
• 50bdfb9a1a [-] BO FixBug Action button in list content jeromenadaud 2013-07-31 18:44:20 +02:00
• 017e5ccbc8 [+] BO Pagination, filter and display jeromenadaud 2013-07-31 18:37:01 +02:00
• 33951c1834 //fixed carrier wizard summary range limit Vincent Augagneur 2013-07-31 18:14:13 +02:00
• d3b000e72f //fixed bug on carrier wizard when is_free Vincent Augagneur 2013-07-31 18:09:00 +02:00
• 683818ebd4 [+] BO : Remove advanced header on empty list jeromenadaud 2013-07-31 18:04:28 +02:00
• ca253bcda2 // update preferences tab Sarah Lorenzini 2013-07-31 17:43:48 +02:00
• e1fa26d002 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-31 17:33:19 +02:00
• 32f23a79a4 //carrier wizard added validation fields Vincent Augagneur 2013-07-31 17:33:09 +02:00
• 60ecfaafd2 //fixed bug on carrier wizard tabindex Vincent Augagneur 2013-07-31 17:16:52 +02:00
• c41537f4e4 [-] INSTALLER : missing parenthesis in SQL in set_product_suppliers, thanks to @EvaldasUzkuras gRoussac 2013-07-31 16:08:54 +02:00
• e85ffae69d [-] INSTALLER : Fix bug while updateing supplier reference, back from https://github.com/PrestaShop/PrestaShop/pull/618 thanks @EvaldasUzkuras gRoussac 2013-07-31 15:55:06 +02:00
• 5e0b5db23b [*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614 gRoussac 2013-07-31 15:16:42 +02:00
• 9debffe910 // update shipping tab Sarah Lorenzini 2013-07-31 15:06:59 +02:00
• d744b9dbf2 // update localization and modules tabs Sarah Lorenzini 2013-07-31 14:47:21 +02:00
• 69944e1618 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-31 14:31:27 +02:00
• 175427cb2e //fixed input text not disabled when change range behavior Vincent Augagneur 2013-07-31 14:31:23 +02:00
• 304e479ca5 Merge pull request #617 from axometeam/patch-16 Gregory Roussac 2013-07-31 05:17:13 -07:00
• 1187e7cb09 [*] BO : Fix statistics redirection when change date Axome 2013-07-31 14:15:33 +02:00
• b0ac617e9f Merge pull request #615 from nilsga/development Gregory Roussac 2013-07-31 05:15:13 -07:00
• 6f27508972 Merge pull request #616 from sebastienhouzet/development Gregory Roussac 2013-07-31 05:11:41 -07:00
• fd339d96b2 [*] Security : deny access to this folder as already done for classes Yoozio 2013-07-31 12:29:05 +02:00
• b362c808dc Fixed fieldset issue when customer is a guest Nils-Helge Garli Hegvik 2013-07-31 12:25:35 +02:00
• e3265dcb1b //carrier wizard range validation 404 when change range type Vincent Augagneur 2013-07-31 11:12:01 +02:00
• be7e4b4128 //carrier wizard Shipping and handling are set to no by default Vincent Augagneur 2013-07-31 11:00:31 +02:00
• 80c2e3ea60 //small fix on carrier wizard Vincent Augagneur 2013-07-31 10:34:52 +02:00
• d68363fdda [-] FO : FixBug #PSCFV-9846 Bookmark title escape problem on special language jeromenadaud 2013-07-31 10:24:14 +02:00
• e1b7470845 [-] BO : FixBug Install currency on Localization Pack jeromenadaud 2013-07-31 09:38:10 +02:00
• 0e3f2d6a82 [-] BO : FixBug Invalid offset when only one error in layout jeromenadaud 2013-07-31 09:18:13 +02:00
• f28a480bf9 // remove console.log gRoussac 2013-07-30 20:36:38 +02:00
• f606cb4efb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-30 20:28:12 +02:00
• 6600112ab1 [-] BO : Fix onchange event on Adminmodules list execption gRoussac 2013-07-30 20:28:06 +02:00
• 9ae8667783 [-] BO : Fix onchange event on adminmoudlue list execption gRoussac 2013-07-30 20:26:45 +02:00
• 024800d4f9 // w3c multiple gRoussac 2013-07-30 20:04:45 +02:00
• edb8cce49f //norms gRoussac 2013-07-30 19:57:23 +02:00
• 5677826b2f // wrong commit gRoussac 2013-07-30 19:21:02 +02:00
• 0821194f94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-30 19:19:32 +02:00
• d6856a5c62 //norms gRoussac 2013-07-30 19:14:43 +02:00
• e0f1041070 // Performance improvements for the cart page Damien Metzger 2013-07-30 19:15:51 +02:00
• d68d844303 // norms gRoussac 2013-07-30 19:02:05 +02:00
• 800c63036e Merge pull request #605 from Captain-FLAM/patch-10 Gregory Roussac 2013-07-30 09:48:11 -07:00
• a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups Kevin Granger 2013-07-30 18:47:13 +02:00
• be613fa008 fixup! [*] BO : Proposition : IMPROVEMENT Admin Modules Positions Captain-FLAM 2013-07-30 17:42:50 +01:00
• 24a70479d3 [-] BO : FixBug Module list template jeromenadaud 2013-07-30 18:06:35 +02:00
• d50b8c679f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-30 18:02:46 +02:00
• fcc1867a94 //merge Vincent Augagneur 2013-07-30 18:02:30 +02:00
• 9bf6871e8d [-] FO : FixBug #PSCFV-9766 All products in products list for email confirmation with multi-shipping jeromenadaud 2013-07-30 17:50:36 +02:00
• cf694be5a1 //fixs carrier wizard Vincent Augagneur 2013-07-30 17:46:44 +02:00
• 635076a7ad // update localization tab Sarah Lorenzini 2013-07-30 17:45:50 +02:00
• a93667a58b [-] FO : FixBug Wrong offset in more than one shipping address jeromenadaud 2013-07-30 17:03:15 +02:00
• 062a4250cc //fixed unclosed div Kevin Granger 2013-07-30 15:26:00 +02:00
• 6ddf2ee1ab [-] BO : FixBug allow_url_fopen on BackOffice home page jeromenadaud 2013-07-30 15:19:54 +02:00
• d9ce51f38c Merge pull request #613 from djfm/nl_installer Damien Metzger 2013-07-30 06:14:40 -07:00
• f59bd2f55f Merge pull request #612 from djfm/development Damien Metzger 2013-07-30 06:13:10 -07:00
• 28c0ef2b7d // added a few translations to NL installer djfm 2013-07-30 13:07:14 +00:00
• faafe4167a // update localization tab Sarah Lorenzini 2013-07-30 14:56:39 +02:00
• 816153687c // update localization tab Sarah Lorenzini 2013-07-30 12:24:28 +02:00
• cba79bdcd6 // corrected quote problems in the translation files djfm 2013-07-30 09:47:02 +00:00
• 3d40814739 //added name in errors array in validateRules Vincent Augagneur 2013-07-30 11:33:30 +02:00
• 9ba17d642a // CarrierWizard: English Strings reviewed and corrected djfm 2013-07-30 09:30:41 +00:00
• 5929727be1 Merge pull request #601 from PrestaEdit/carrier_wizard2 Vincent Augagneur 2013-07-30 02:22:45 -07:00
• 3814a8c735 [-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix Vincent Augagneur 2013-07-30 10:40:13 +02:00
• 4185026880 [-] CORE : Fix warning #PSCFV-9678 when sending message to customer gRoussac 2013-07-30 10:37:07 +02:00
• 8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields Kevin Granger 2013-07-30 10:35:47 +02:00
• a36ac7784d // trailing space gRoussac 2013-07-30 10:35:23 +02:00
• 7d57255b70 [-] BO : FixBug #PSCFV-9959 file_get_contents error Jérôme Nadaud 2013-07-30 10:27:55 +02:00
• 192940946d // Fixed pscleaner method Damien Metzger 2013-07-30 09:19:13 +02:00
• b95478d529 [+] BO Customers Groups WIP Kevin Granger 2013-07-29 20:39:52 +02:00
• b004151695 Merge pull request #599 from PrestaShop/master Gregory Roussac 2013-07-29 10:19:55 -07:00
• d95a519ace [+] BO Customers WIP Kevin Granger 2013-07-29 19:18:02 +02:00
• 918ceb3ed5 // norms gRoussac 2013-07-29 19:15:47 +02:00
• a23a576d47 Merge pull request #611 from 202-ecommerce/fix_translation Gregory Roussac 2013-07-29 10:07:50 -07:00
• 8ddd592da1 [-] BO : Fix while of translation, to find in folder if translation exists Guillaume DELOINCE 2013-07-29 19:00:57 +02:00
• 53c195e9d9 Merge pull request #610 from indesign47/patch-8 Gregory Roussac 2013-07-29 09:38:59 -07:00
• 39a6d0a42d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-29 18:37:18 +02:00
• db98509443 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-29 18:37:01 +02:00
• 0ecc2fb0a0 [-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack Jérôme Nadaud 2013-07-29 18:36:55 +02:00
• 0e6f1598f7 [-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img Vincent Augagneur 2013-07-29 18:36:50 +02:00
• 5f791dc839 Merge pull request #541 from indesign47/patch-4 Gregory Roussac 2013-07-29 09:36:32 -07:00
• b8dc750547 [*] BO : shipping enlarge listbox carriers indesign47 2013-07-29 18:25:05 +02:00
• 72dc8b943f [-] FO : FixBug #PSCFV-9961 Remove wishlists icon Jérôme Nadaud 2013-07-29 17:58:31 +02:00
• aa9a6e66b8 [-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B Jérôme Nadaud 2013-07-29 17:44:14 +02:00
• d356fe684a Merge pull request #608 from indesign47/patch-7 Gregory Roussac 2013-07-29 08:23:32 -07:00
• d76059ff23 [*] BO : skip the first line by default indesign47 2013-07-29 17:19:46 +02:00
• 44b9909d4f Merge pull request #607 from indesign47/patch-6 Gregory Roussac 2013-07-29 08:12:26 -07:00
• 65287d71c3 [-] BO : doesn't match available_fields of AdminImportController indesign47 2013-07-29 17:10:57 +02:00
• 613c9b66e5 // fix carriers Kevin Granger 2013-07-29 16:51:03 +02:00
• 483dbd7b53 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-07-29 16:21:31 +02:00
• ae225dce4c // WIP customer Kevin Granger 2013-07-29 16:16:10 +02:00
• b528b7b6fc // update shipping tab Sarah Lorenzini 2013-07-29 16:13:07 +02:00
• 101d9283ae // update wizard Sarah Lorenzini 2013-07-29 15:12:50 +02:00
• ab0189a726 [-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects gRoussac 2013-07-29 14:39:35 +02:00
• 243834ee17 // update shipping tab sLorenzini 2013-07-29 14:14:00 +02:00