dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,172 Commits 9 Branches 19 Tags
768a8b36d5b622df0fc8a327de98b9528c25c2dc
Commit Graph
18172 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Francois Gaillard 768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Fabio Chelly 1b0c5be93d Merge remote-tracking branch 'origin/development' into development 2013-09-06 11:47:11 +02:00
Fabio Chelly 663f592306 [-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not 
#PNM-627
#PNM-1610
#PNM-1616
 2013-09-06 11:40:41 +02:00
Damien Metzger ec11b7e064 // Better control of the requests when our website is down 2013-09-06 10:18:48 +02:00
Fabio Chelly 7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-06 09:24:43 +02:00
gRoussac 53241af228 // remove strict standard warning 2013-09-05 19:00:25 +02:00
gRoussac a7d619b208 [-] MO : fix bug #PSCFV-9906 again, bad url parsing 2013-09-05 18:39:07 +02:00
Rémi Gaillard 0f81518ba2 // Add a buton to erase all log 2013-09-05 15:58:36 +02:00
gRoussac 6e5fb47642 [-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update 2013-09-05 15:31:13 +02:00
gRoussac 824a6b90f3 [-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift 2013-09-05 11:07:41 +02:00
Gregory Roussac 284711b22f Merge pull request #697 from sjousse/patch-1 
MO : Shopimporter change the way to get the home category (get it from Configuration )
 2013-09-05 01:16:29 -07:00
sjousse 2f6e0e3fae Changed the way to get the home category (get it from Configuration table now) 2013-09-05 10:14:31 +02:00
Gregory Roussac d59f3383cf Merge pull request #694 from sjousse/patch-1 
[*] MO : ShopImporter module is now aware of multi-shop for categories
 2013-09-04 09:28:23 -07:00
sjousse 4d68595447 ShopImporter module is now aware of multi-shop 
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
 2013-09-04 18:26:24 +02:00
Gregory Roussac 07bdcd4129 Merge pull request #693 from sjousse/development 
[-] MO : Add date_add field to categories to prevent failure of updateCat() method
 2013-09-04 07:46:44 -07:00
sjousse e9d066c981 fix value of date_add 2013-09-04 16:40:12 +02:00
sjousse 56a1449c69 add date_add to categories 2013-09-04 16:32:00 +02:00
gRoussac 63c19ce1a9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:39:25 +02:00
gRoussac 3ca2c8da95 [-] BO : Fix #PSCFV-9906 could not register search engines keywords 2013-09-04 15:39:02 +02:00
Rémi Gaillard 00c1860d22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:08:41 +02:00
Rémi Gaillard 9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 2013-09-04 15:05:55 +02:00
gRoussac 7b0349ca33 // bad commit sorry for that 2013-09-04 11:14:45 +02:00
gRoussac efa81a7107 [-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0 2013-09-04 11:14:00 +02:00
gRoussac da353c884d [-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT 2013-09-04 10:45:48 +02:00
gRoussac df56d7af42 [-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678 2013-09-04 10:38:14 +02:00
Gregory Roussac 5d38743b72 Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton 
[-] BO : Remove warning in AdminController.php
 2013-09-04 00:40:41 -07:00
Jerome Nadaud 75a663b6e3 [-] BO : Fix pull request #665 2013-09-04 09:40:12 +02:00
ha99y f4892686c1 Warning in AdminController.php 
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.

Warning: simplexml_load_file()
1: parser error : Document is empty
 2013-09-03 17:30:05 -07:00
gRoussac b55a84e961 [-] INSTALLER : Fix infinite loop when order message has additional ampersand 2013-09-03 18:36:30 +02:00
gRoussac 6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
gRoussac 5d8e187faa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-03 17:43:51 +02:00
gRoussac 0891c986d6 // fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919 2013-09-03 17:43:33 +02:00
Gregory Roussac 8fedbe189c Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup 
[*] Project : Orders should rely only on ps_order_cart_rule
 2013-09-03 06:41:06 -07:00
soufyan cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule 2013-09-03 15:10:06 +02:00
Gregory Roussac 5caae97813 Merge pull request #680 from djfm/development 
// fixed unstranslatable string in AdminSupplyOrdersController
 2013-09-03 06:00:50 -07:00
djfm 572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController 2013-09-03 12:51:21 +00:00
gRoussac 98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Gregory Roussac 656717fb4c Merge pull request #679 from kluevandrew/patch-3 
[*] BO : Cursor "pointer" for .button class
 2013-09-03 00:51:38 -07:00
Gregory Roussac e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 
[*] BO: sort modules name in Stats
 2013-09-03 00:49:11 -07:00
Andrew 97f1db480a BO: Cursor "pointer" for .button 
Cursor "pointer" for each button in back office
 2013-09-03 11:35:50 +04:00
Jerome Nadaud c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 19:11:17 +02:00
Jerome Nadaud da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
gRoussac 94bdde4630 [-] CORE : Remove PHP Warning: file_put_contents on modules config.xml 2013-09-02 18:19:21 +02:00
Gregory Roussac abf5ad195c Merge pull request #676 from dlage/patch-1 
[*] MO : blocknewproducts avoid $newProducts not defined
 2013-09-02 08:58:32 -07:00
Gregory Roussac b2ccf88296 Merge pull request #663 from sjousse/patch-1 
[-] MO : Shopimporter file_exists does not exists in Validate Class
 2013-09-02 08:21:42 -07:00
Gregory Roussac f7eb6b3a16 Merge pull request #665 from Ha99y/Get-Combination-Images 
[*] CLASSES : Add $id_product_attribute param to Image::getImages
 2013-09-02 08:11:48 -07:00
Rémi Gaillard 6059b4301a // states list 2013-09-02 17:10:20 +02:00
gRoussac 36d9e0eed5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 16:28:56 +02:00
gRoussac c6d2e1252e [-] INSTALLER : Fix fatal error in upgrade, could not load configuration class 2013-09-02 16:28:38 +02:00
Gregory Roussac fe209e0c55 Merge pull request #678 from gr4devel/patch-5 
[*] BO : add TinyMCE editor for supplier descrpition in AdminSuppliers
 2013-09-02 06:03:20 -07:00