dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,266 Commits 9 Branches 19 Tags
e6e8efc19ab354147c7bf33db25a23a53e4ddacd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 2d5bd901f4 [*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3 2013-09-16 18:51:06 +02:00
gRoussac b9b4265517 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-16 17:18:56 +02:00
gRoussac 15dd1cf96f [-] BO : Fix bugPSCFV-10249 images copy when unix path 2013-09-16 17:16:11 +02:00
Gregory Roussac 1c58c1ea6b Merge pull request #726 from cinscaen/patch-1 
[-] BO : Move product images in POST method in admin.js
 2013-09-16 07:01:45 -07:00
gRoussac 8504574ae1 [-] IN : Could not remove some tabs 2013-09-16 15:02:12 +02:00
gRoussac 08efa4e313 [-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists 2013-09-16 11:12:55 +02:00
Gregory Roussac 3b9c125198 Merge pull request #723 from codeurWeb/patch-2 
[+] MO : Blocknewproducts add hookHome
 2013-09-14 08:58:14 -07:00
gRoussac 73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template 2013-09-14 00:05:45 +02:00
gRoussac 10472ef83c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-13 17:57:06 +02:00
gRoussac 6da1228359 [-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed 2013-09-13 17:56:45 +02:00
Gregory Roussac a3d9643833 Merge pull request #719 from zimmi1/patch-4 
Update Connection.php correction from 717
 2013-09-13 02:59:06 -07:00
Gregory Roussac 61295e4e21 Merge pull request #717 from zimmi1/patch-2 
[*] CORE : Speeding up sql queries in Connection
 2013-09-13 02:09:25 -07:00
gRoussac d9bc07d030 [-] BO : quote badly decoded in customerThreads 2013-09-13 10:45:07 +02:00
gRoussac db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
gRoussac 5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Gregory Roussac 8590b0e699 Merge pull request #716 from romainberger/typos 
[*] FO : removed extra slash and point
 2013-09-12 05:30:36 -07:00
gRoussac e5276ff531 [-] FO : 301 Redirect /iso_lang to /iso_lang/ url 2013-09-12 11:16:12 +02:00
gRoussac 90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
gRoussac 3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop 
Conflicts:
	modules/mailalerts/mailalerts.php
 2013-09-12 10:09:25 +02:00
Gregory Roussac f0297824d7 Merge pull request #709 from AgenceNetDesign/development 
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
 2013-09-12 00:56:36 -07:00
Gregory Roussac c91a86740f Merge pull request #715 from Prestaspirit/patch-6 
[-] MO : Blocklayered Fixed a bug when displaying textures
 2013-09-12 00:55:28 -07:00
gRoussac e2dac03baa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-11 16:30:52 +02:00
gRoussac dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
gRoussac 01be908e51 [-] CORE : Could not add several cart rules 2013-09-11 14:50:42 +02:00
gRoussac 9f12ff15be [-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta 2013-09-11 10:30:40 +02:00
Gregory Roussac 53805f2b93 Merge pull request #712 from Prestaworks/patch-13 
[-] MO : Customization data is not included in new order email.
 2013-09-11 00:58:30 -07:00
gRoussac 85a471a690 //bad commit , sorry for that 2013-09-10 18:51:20 +02:00
gRoussac 86d3a8afe1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-10 18:49:05 +02:00
gRoussac f94f0f14a4 [-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address 2013-09-10 18:48:28 +02:00
Gregory Roussac 31d762b88a Merge pull request #710 from nilsga/development 
[*] CORE : Add Bcc support in Mail class
 2013-09-10 09:24:04 -07:00
gRoussac 332d68c7ec [-] MO : Statsdata, exception on duplicate entry 2013-09-10 11:08:57 +02:00
gRoussac 4968a792b4 [-] IN : Remove notice when upgrading from 2013-09-10 01:12:52 +02:00
Gregory Roussac a383d55421 Merge pull request #707 from sjousse/development 
[-] MO: ShopImporter fix imported prices
 2013-09-09 08:31:15 -07:00
Gregory Roussac 5362f4d426 Merge pull request #699 from sjousse/patch-1 
[*] MO : ShopImporter Optimize image copy in ShopImport module
 2013-09-09 08:11:51 -07:00
Gregory Roussac 9880d152d4 Merge pull request #706 from sjousse/development 
[*] MO : Add some fields to Orders in Import module
 2013-09-09 08:10:12 -07:00
gRoussac e6d0a3e5a4 // revert form https://github.com/PrestaShop/PrestaShop/commit/2874f1498352228c84df969c42e9d8f699a8afc5 2013-09-09 15:11:55 +02:00
gRoussac 54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ 2013-09-09 12:20:38 +02:00
gRoussac b975a9375c [-] IN : remove warnings while upgrading 2013-09-09 00:10:03 +02:00
gRoussac 9c756a7fcb [-] IN : Do not duplicate images types when coming from 1.4, update it 2013-09-08 23:22:36 +02:00
gRoussac 6b03af9ef9 [-] BO : ini_get('safe_mode') can return false 2013-09-08 22:26:21 +02:00
gRoussac ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
gRoussac e6f8dba2e6 // remove Notice: Undefined index 2013-09-08 19:55:03 +02:00
gRoussac 25ba388d69 [-] IN : fix bad pathes 2013-09-08 18:29:06 +02:00
gRoussac e5337f5e76 [-] IN : Do not test module names if they are not directories 2013-09-08 18:25:54 +02:00
gRoussac 683513a9d2 [-] IN : Remove fails on upgrade coming to loop when upgrading again 2013-09-08 17:29:00 +02:00
gRoussac 19a6c4373e [-] IN : Remove warnings when safe_mode open_basedir missconfigured 2013-09-08 17:25:59 +02:00
gRoussac 2874f14983 [-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled 2013-09-06 23:55:58 +02:00
gRoussac 4c49048e39 [-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule 2013-09-06 18:35:56 +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
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
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
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
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
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
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
Gregory Roussac 5caae97813 Merge pull request #680 from djfm/development 
// fixed unstranslatable string in AdminSupplyOrdersController
 2013-09-03 06:00:50 -07: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
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
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
gRoussac 477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 2013-09-02 12:03:01 +02:00
gRoussac 4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active 2013-09-02 11:33:53 +02:00
gRoussac 62303e58df [-] INSTALLER : Fix fatal error when upgrading 2013-09-02 11:24:46 +02:00
Gregory Roussac 82939730dd Merge pull request #667 from Ha99y/Small-Autoload-Fix 
[-] CORE : Remove warning on rename on index.php
 2013-09-02 02:11:51 -07:00
gRoussac 397e42637a // norms 2013-09-02 10:49:50 +02:00
Gregory Roussac 6dc0edec3a Merge pull request #668 from lrosset/development 
[-] CORE : Add APCu support
 2013-09-02 01:46:25 -07:00
Gregory Roussac d019500d81 Merge pull request #670 from gr4devel/patch-2 
[+] FO : add getManufacturer() to ManufacturerControllerCore
 2013-09-02 01:31:14 -07:00
Gregory Roussac 00afa8ae47 Merge pull request #671 from gr4devel/patch-3 
[+] BO : enable TinyMCE editor for short and long descrpition in AdminManufacturers
 2013-09-02 01:09:10 -07:00
gRoussac a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	modules/blockcart/ajax-cart.js
 2013-09-02 10:00:24 +02:00
Gregory Roussac a436456fa4 Merge pull request #673 from sagaradonis/development 
[*] FO : Deprecated .size() to .length
 2013-09-02 00:31:05 -07:00
gRoussac 50d5a71ca6 [-] Classes : fix memcache ext #PSCFV-5225 thanks @up2date 2013-08-20 23:09:12 +02:00
gRoussac b22c2b28ec Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-14 10:29:24 +02:00
gRoussac 0bd04d9f3e [*] BO : Clear smarty cache when submitting SEO rules 2013-08-14 10:27:39 +02:00
gRoussac 533b28ce32 Merge branch 'prestarocket-duplicate_id' into release 2013-08-13 18:26:51 +02:00
gRoussac f459af7090 Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id 2013-08-13 18:26:22 +02:00
gRoussac 1984cb6272 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-13 16:30:39 +02:00
gRoussac 5123d2505e [-] CORE : Do not delete index.php in smarty cache or /img/tmp/ 2013-08-13 16:29:40 +02:00
gRoussac e8685b1430 [*] BO : Add clear smarty cache button 2013-08-13 15:11:00 +02:00
Gregory Roussac 1e10dab8f8 Merge pull request #646 from kpodemski/patch-2 
[*] CORE : Get instance of current category in category controller
 2013-08-13 05:54:40 -07:00
gRoussac 5d0f1499ac // without hedgehogs is better 2013-08-12 16:50:14 +02:00
gRoussac 30d9ebe68f [-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif 2013-08-12 16:44:25 +02:00
gRoussac 7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski 2013-08-12 16:23:54 +02:00