dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,769 Commits 9 Branches 19 Tags
edfe77b74f09b0c4e6565abd8d19c10f7a9f6aba
Commit Graph
17769 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac edfe77b74f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 10:43:14 +02:00
gRoussac a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
 2013-08-06 10:42:44 +02:00
Damien Metzger f557f24df4 // Fixed module cache key (with the country) 2013-08-06 10:41:58 +02:00
Gregory Roussac 77ba55b090 Merge pull request #629 from ChristopheBoucaut/patch-4 
[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
 2013-08-06 01:30:46 -07:00
Vincent Augagneur 5bcfc7d4e9 //carrier wizard step validation part 2 2013-08-06 10:30:10 +02:00
Vincent Augagneur fe58053439 //carrier wizard step validation 2013-08-06 10:27:32 +02:00
ChristopheBoucaut 0139e3f877 Update WebserviceRequest.php 
The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
 2013-08-06 10:22:45 +02:00
Gregory Roussac 23b9c3b8f9 Merge pull request #627 from davyrolink/upstream 
[*] CORE : add $smarty to params in smartyHook function
 2013-08-06 01:10:41 -07:00
Vincent Augagneur 88d4f57894 //carrier range validation fix 2013-08-06 10:04:54 +02:00
Francois Gaillard 29bbe81ae6 // CloudCache removed from AdminPerformanceController 2013-08-06 09:25:47 +02:00
Davy Rolink 0b99a7b331 added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope 2013-08-05 23:20:19 +02:00
Gregory Roussac 5f0ef76731 Merge pull request #626 from davyrolink/upstream 
[-] CORE : id_address_invoice was not updated, updateAddressId method
 2013-08-05 14:13:54 -07:00
Davy Rolink f3361fbedf Bug fix: id_address_invoice was not updated, updateAddressId method of the Cart class 2013-08-05 22:53:54 +02:00
Rémi Gaillard faec5a9226 // small change on fixtures installation 2013-08-05 20:33:39 +02:00
gRoussac adceb5ccf5 [-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey 2013-08-05 19:16:44 +02:00
Gregory Roussac 9f13b9f7b1 Merge pull request #474 from madef/master 
[*] Project : Add paging to Collections
 2013-08-05 09:52:16 -07:00
jeromenadaud 8be06bba2d [-] BO : FixBug Multiple list pagination error. 2013-08-05 18:22:30 +02:00
gRoussac d585b015c1 // move toolbar delete button on AdminProducts 2013-08-05 18:18:35 +02:00
Gregory Roussac 931cfee258 Merge pull request #625 from axometeam/patch-18 
[-] MO : All fields available in the RSS
 2013-08-05 09:06:02 -07:00
Vincent Augagneur ea10b94ef2 //onkeypress enter to validate range 2013-08-05 18:02:08 +02:00
Axome 9dfeb1d528 All fields available in the RSS 
Not just link & title but all available fields
 2013-08-05 17:58:49 +02:00
Vincent Augagneur cf9d20f83b //range overlapping bug fix 2013-08-05 17:43:31 +02:00
gRoussac 9ca9928c58 [-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis 2013-08-05 17:17:22 +02:00
gRoussac 5cd75f23ff [-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis 2013-08-05 17:05:07 +02:00
Vincent Augagneur 3a75a783f6 //added label on carrier zones && improve range validation 2013-08-05 16:54:36 +02:00
gRoussac a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
jeromenadaud fc54ddb86f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:32:55 +02:00
jeromenadaud 114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception 2013-08-05 16:32:39 +02:00
Francois Gaillard 58b5028147 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:25:57 +02:00
Francois Gaillard 176c6a8767 [-] Classes : ModuleFrontController updated. Thank you @codeurWeb 2013-08-05 16:25:52 +02:00
jeromenadaud 48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
Rémi Gaillard 3317ab878d [-] WS: add id_address_delivery on cart products association 2013-08-05 15:53:40 +02:00
Gregory Roussac 07181a37f5 Merge pull request #413 from ccauw/patch-9 
[-] BO : bug color parameter in List
 2013-08-05 06:37:46 -07:00
Francois Gaillard db951f5b76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 15:37:20 +02:00
Francois Gaillard f217061e27 [-] Classes : ModuleFrontController & templates overrides fixed 2013-08-05 15:37:16 +02:00
Damien Metzger f3b87f126a // Feeder not installed by default 2013-08-05 15:32:52 +02:00
gRoussac ed887fd5c3 [*] BO : Add filter choices in title of List, thankx to @ccauw 2013-08-05 15:18:42 +02:00
gRoussac 2ea0dc7749 [*] CORE : Allow external css loading, manual merge of https://github.com/PrestaShop/PrestaShop/pull/406 thanks @m-hume 2013-08-05 14:26:07 +02:00
Gregory Roussac d1631e6920 Merge pull request #405 from ottonascarella/patch-1 
[*] CORE : Enable Progressive JPG
 2013-08-05 05:08:10 -07:00
Vincent Augagneur 5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Gregory Roussac b8e5ad0e44 Merge pull request #624 from iNem0o/development 
[-] FO : getBestSales() $order_way doesnt  work in DESC mode
 2013-08-05 04:58:39 -07:00
inem0o 2de866eff3 Correct assignation of $order_way parameter 2013-08-05 12:21:19 +02:00
gRoussac 13b3adb8c0 [-] INSTALLER : Force update of PS_LEGACY_IMAGES to 0 2013-08-05 12:17:21 +02:00
gRoussac 8c2af798a4 // small change on pack css 2013-08-05 12:01:40 +02:00
Damien Metzger 144c85ed4f // Removed useless param 2013-08-05 11:40:03 +02:00
Damien Metzger 581dcec718 // [-] IN : Fixed language detection and help in the installer 2013-08-05 11:23:09 +02:00
Damien Metzger 7f4e4efbd8 [*] TR : Added 10 new localization packs 2013-08-05 11:23:09 +02:00
gRoussac 19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses 2013-08-05 10:47:04 +02:00
Sarah Lorenzini 166d8a69fa [-] FO: fixed bug shopping cart price misplaced - #9971 2013-08-05 10:21:46 +02:00