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

• 931cfee258 Merge pull request #625 from axometeam/patch-18 Gregory Roussac 2013-08-05 09:06:02 -07:00
• ea10b94ef2 //onkeypress enter to validate range Vincent Augagneur 2013-08-05 18:02:08 +02:00
• 9dfeb1d528 All fields available in the RSS Axome 2013-08-05 17:58:49 +02:00
• cf9d20f83b //range overlapping bug fix Vincent Augagneur 2013-08-05 17:43:31 +02:00
• 9ca9928c58 [-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis gRoussac 2013-08-05 17:17:22 +02:00
• 5cd75f23ff [-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis gRoussac 2013-08-05 17:05:07 +02:00
• 3a75a783f6 //added label on carrier zones && improve range validation Vincent Augagneur 2013-08-05 16:54:36 +02:00
• a98740d25c // small change, switch two buttons in list_header gRoussac 2013-08-05 16:39:29 +02:00
• fc54ddb86f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development jeromenadaud 2013-08-05 16:32:55 +02:00
• 114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception jeromenadaud 2013-08-05 16:32:39 +02:00
• 58b5028147 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-08-05 16:25:57 +02:00
• 176c6a8767 [-] Classes : ModuleFrontController updated. Thank you @codeurWeb Francois Gaillard 2013-08-05 16:25:52 +02:00
• 48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development jeromenadaud 2013-08-05 16:12:04 +02:00
• b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist jeromenadaud 2013-08-05 16:11:48 +02:00
• 3317ab878d [-] WS: add id_address_delivery on cart products association Rémi Gaillard 2013-08-05 15:53:40 +02:00
• 07181a37f5 Merge pull request #413 from ccauw/patch-9 Gregory Roussac 2013-08-05 06:37:46 -07:00
• db951f5b76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-08-05 15:37:20 +02:00
• f217061e27 [-] Classes : ModuleFrontController & templates overrides fixed Francois Gaillard 2013-08-05 15:37:16 +02:00
• f3b87f126a // Feeder not installed by default Damien Metzger 2013-08-05 15:32:36 +02:00
• ed887fd5c3 [*] BO : Add filter choices in title of List, thankx to @ccauw gRoussac 2013-08-05 15:18:42 +02:00
• 2ea0dc7749 [*] CORE : Allow external css loading, manual merge of https://github.com/PrestaShop/PrestaShop/pull/406 thanks @m-hume gRoussac 2013-08-05 14:26:07 +02:00
• d1631e6920 Merge pull request #405 from ottonascarella/patch-1 Gregory Roussac 2013-08-05 05:08:10 -07:00
• 5a88dc0f8b //fixed bug on carrier wizard when edit carrier Vincent Augagneur 2013-08-05 14:06:50 +02:00
• b8e5ad0e44 Merge pull request #624 from iNem0o/development Gregory Roussac 2013-08-05 04:58:39 -07:00
• 2de866eff3 Correct assignation of $order_way parameter inem0o 2013-08-05 12:21:19 +02:00
• 13b3adb8c0 [-] INSTALLER : Force update of PS_LEGACY_IMAGES to 0 gRoussac 2013-08-05 12:17:21 +02:00
• 6533ee4bec // update stock tab Sarah Lorenzini 2013-08-05 12:13:43 +02:00
• 8c2af798a4 // small change on pack css gRoussac 2013-08-05 12:01:40 +02:00
• 144c85ed4f // Removed useless param Damien Metzger 2013-08-05 11:40:03 +02:00
• 581dcec718 // [-] IN : Fixed language detection and help in the installer Damien Metzger 2013-08-05 11:22:55 +02:00
• 7f4e4efbd8 [*] TR : Added 10 new localization packs Damien Metzger 2013-08-05 09:25:54 +02:00
• 19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses gRoussac 2013-08-05 10:47:04 +02:00
• 166d8a69fa [-] FO: fixed bug shopping cart price misplaced - #9971 Sarah Lorenzini 2013-08-05 10:21:46 +02:00
• 003c05a729 [-] BO: Fix #PSCFV-9885 catalog price rules edition Rémi Gaillard 2013-08-05 09:55:29 +02:00
• 9ff0d60158 [-] BO : FixBug #PSCFV-7839 No invoice file attached to payment email confirmation jeromenadaud 2013-08-05 09:41:46 +02:00
• 9f11ecfd78 // Add label attributes for, refacto browse file Kevin Granger 2013-08-02 18:46:37 +02:00
• 055134719d [-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392 gRoussac 2013-08-02 18:33:53 +02:00
• 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 Gregory Roussac 2013-08-02 09:15:51 -07:00
• 33116dfa47 [-] FO : Fix bug #PSCFV-9856 could not add Uncombinable cart rules and Minimum amount check badly calculated gRoussac 2013-08-02 18:00:10 +02:00
• 94a43f2991 // update advanced parameters and administration tabs Sarah Lorenzini 2013-08-02 17:44:26 +02:00
• be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard Vincent Augagneur 2013-08-02 17:29:15 +02:00
• 60f567d2ff // update modules tab Sarah Lorenzini 2013-08-02 15:20:12 +02:00
• 142006e69a // update advanced parameters Sarah Lorenzini 2013-08-02 15:10:58 +02:00
• f55a8c2dd5 //remove debug Vincent Augagneur 2013-08-02 11:38:38 +02:00
• 02fdc5fe24 //fixed float validation on carrier wizard Vincent Augagneur 2013-08-02 11:25:08 +02:00
• f2146ac2ae //fixed somes bug on carriers wizard Vincent Augagneur 2013-08-02 10:54:07 +02:00
• 46d0663b2f //remove debug Vincent Augagneur 2013-08-02 10:29:30 +02:00
• 9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range Vincent Augagneur 2013-08-02 10:22:06 +02:00
• fc63b8ad7f // Improved configuration checklist Damien Metzger 2013-08-02 09:11:55 +02:00
• 32b50b4dad // small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep) Kevin Granger 2013-08-01 20:25:36 +02:00
• 268b3c6bda // Variables name fixed Francois Gaillard 2013-08-01 19:14:04 +02:00
• b51d4f4c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-08-01 19:11:27 +02:00
• 28de7890d2 [*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook) Francois Gaillard 2013-08-01 19:10:25 +02:00
• d8f5caee7b [-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation jeromenadaud 2013-08-01 19:09:34 +02:00
• ac48c1b786 //remove inline css Vincent Augagneur 2013-08-01 18:26:39 +02:00
• 3f2da1095f [-] BO: FixBug #PSCFV-10005 Filter on COUNT field jeromenadaud 2013-08-01 18:06:14 +02:00
• b34acf74f2 [-] BO : FixBug Undefined variable title jeromenadaud 2013-08-01 17:33:53 +02:00
• 07ce127723 [-] Classes : Bug fix Validate.php - Error with $mail_name Francois Gaillard 2013-08-01 17:31:45 +02:00
• e2abf3ecb7 // update preferences tab -> images controller Sarah Lorenzini 2013-08-01 17:25:49 +02:00
• 24bf5e5bdf [-] BO : FixBug Undefined variable currency jeromenadaud 2013-08-01 17:26:07 +02:00
• 7e7b5af26e // Profiler fixed Francois Gaillard 2013-08-01 17:21:38 +02:00
• 1447be6f3c //fixed bug when changing range type Vincent Augagneur 2013-08-01 17:16:52 +02:00
• fa958c9a5e //carrier wizard currency sign bug Vincent Augagneur 2013-08-01 17:13:08 +02:00
• 174dfa9a6b [+] BO : Filter button default css class style jeromenadaud 2013-08-01 17:13:02 +02:00
• a29fa2dd09 [+] BO Better filters display jeromenadaud 2013-08-01 16:59:08 +02:00
• 047ab9d681 // update images controller Sarah Lorenzini 2013-08-01 16:45:46 +02:00
• 50a54240b9 // update images controller Sarah Lorenzini 2013-08-01 16:43:58 +02:00
• 680497f1e3 // update preferences tab Sarah Lorenzini 2013-08-01 16:26:02 +02:00
• 6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper gRoussac 2013-08-01 16:15:41 +02:00
• ccc2312053 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-01 16:12:19 +02:00
• 1028c8671c [-] CORE : Merge from PrestaEdit last pull request again gRoussac 2013-08-01 16:12:05 +02:00
• adede4f7ea //small fix Vincent Augagneur 2013-08-01 16:11:50 +02:00
• 9c86943e2a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-01 16:03:19 +02:00
• c0db0bfca9 //Added currency sign and weigh unit on carrier wizard Vincent Augagneur 2013-08-01 16:03:14 +02:00
• b27d030fd2 // Added units to package dimensions Damien Metzger 2013-08-01 15:52:07 +02:00
• 79a4a84163 //small fix on carrier wizard oups Vincent Augagneur 2013-08-01 15:41:42 +02:00
• f5454748b2 //small fix on carrier wizard Vincent Augagneur 2013-08-01 15:41:01 +02:00
• 9df90cc575 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-01 15:23:30 +02:00
• c9b1546a2e //disabled all fess when carrier is free Vincent Augagneur 2013-08-01 15:23:26 +02:00
• 550aa01faf [-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit jeromenadaud 2013-08-01 15:14:14 +02:00
• 48067e1a3d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development jeromenadaud 2013-08-01 15:12:37 +02:00
• 7fb483eaa2 // harmonisation within Tools:: instead self:: gRoussac 2013-08-01 15:07:38 +02:00
• c9bb88cac7 // harmonisation within Tools:: instead self:: gRoussac 2013-08-01 14:52:29 +02:00
• 99ebde1e8e Merge pull request #622 from PrestaEdit/patch-48 Gregory Roussac 2013-08-01 05:48:49 -07:00
• 37cd2a3ab3 [*] Class: Tools / toCamelCase PrestaEdit 2013-08-01 14:42:51 +02:00
• 5defc39def [+] BO Images / Marketing / Spe. Prices Rules Kevin Granger 2013-08-01 14:42:43 +02:00
• fd7facc9b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-01 14:28:41 +02:00
• 8a9376ae22 [-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content gRoussac 2013-08-01 14:28:36 +02:00
• 2b6b65a303 // norms gRoussac 2013-08-01 14:27:50 +02:00
• 409bc533cd [-] BO : FixBug #PSCFV-9748 Missing confirmation and update button problem jeromenadaud 2013-08-01 14:21:48 +02:00
• c6c4fd03e8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-01 14:12:39 +02:00
• 0898a63060 //fixed bug when carrier is free Vincent Augagneur 2013-08-01 14:12:32 +02:00
• 82a912e3f1 // Fixed iframe height in the installer Damien Metzger 2013-08-01 12:30:23 +02:00
• 3cfa17b837 // Improved help iframe in the installer Damien Metzger 2013-08-01 11:58:58 +02:00
• afd41af8c5 //carrier wizard fix logo duplication when edit carrier Vincent Augagneur 2013-08-01 12:20:55 +02:00
• 5f9d83dd37 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-01 12:10:06 +02:00
• 59fca8eb85 //carrier wizard fix when range as no fees Vincent Augagneur 2013-08-01 12:09:58 +02:00
• 3e75881bdc Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-01 11:48:50 +02:00
• dfb1924884 //carrier wizard fix when edit a carrier Vincent Augagneur 2013-08-01 11:47:39 +02:00
• 184a1c561c [-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page gRoussac 2013-08-01 11:44:00 +02:00