dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,933 Commits 9 Branches 19 Tags
e2d8a33a814d7be6bb8bd85f4bb52ff5d489b20c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac e2d8a33a81 [*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960 2013-11-11 14:02:11 +01:00
gRoussac a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
gRoussac de404706d9 [*] CORE : Profiling hide non doubles 2013-11-11 02:09:50 +01:00
gRoussac 3f9338e13d [*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop 2013-11-11 01:59:10 +01:00
gRoussac 38da826671 [-] FO : getTaxCalculator bad cache key again // sorry about that 2013-11-11 01:37:20 +01:00
gRoussac fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct 2013-11-11 01:00:55 +01:00
gRoussac 8dd951c2df [*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory 2013-11-11 00:36:17 +01:00
gRoussac 7e93b2cffd [-] FO : getTaxCalculator bad cache key 2013-11-11 00:13:35 +01:00
gRoussac 19da345531 [-] BO : Could not check all modules after ajax call 2013-11-10 21:51:14 +01:00
gRoussac 7eb70486e0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-08 15:54:28 +01:00
gRoussac ebc3dfee62 [-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index 2013-11-08 15:54:13 +01:00
Gregory Roussac ee487fde59 Merge pull request #953 from Shagshag/patch-4 
[*] BO: kb was not translatable
 2013-11-08 06:37:26 -08:00
gRoussac 530b6dc501 // Productscomments remove warnings 2013-11-08 15:00:56 +01:00
gRoussac 5364be686e // More simple names for csv import files 2013-11-08 14:59:43 +01:00
gRoussac 472dc8c27d [-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556 2013-11-07 17:59:04 +01:00
Gregory Roussac fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups 
[-] FO : in multistore payment module restrictions by customer group was...
 2013-11-07 06:39:57 -08:00
gRoussac 7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load 2013-11-07 15:11:30 +01:00
gRoussac 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
gRoussac fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
gRoussac 514c087962 [*] BO : New import csv files 2013-11-06 18:38:32 +01:00
gRoussac 00887942d3 // preg_last_error not available on every stacks 2013-11-06 18:32:39 +01:00
gRoussac afe6c9bc6f // missing dir sep on is_dir (open_basedir) 2013-11-06 18:23:01 +01:00
gRoussac fc6041fa33 [-] IN : bad path in create multistore 2013-11-06 18:06:19 +01:00
gRoussac 76b03856e2 // missing trailing dir sep 2013-11-06 17:33:18 +01:00
gRoussac 1fb8ef823d [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl 2013-11-06 11:50:52 +01:00
gRoussac 581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
gRoussac 87be153e42 [-] MO : Blockcategories last_visited_category must not be cached 2013-11-05 11:16:52 +01:00
Gregory Roussac f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted 
[*] MO : Blocklayered filter feature blocks sorted
 2013-11-05 01:50:48 -08:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Gregory Roussac c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop 
[-] MO : Missing context shop for categories
 2013-11-05 01:10:39 -08:00
gRoussac 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
gRoussac be13f82b30 [*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 2013-11-04 18:20:01 +01:00
gRoussac c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
gRoussac c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +01:00
gRoussac 3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 14:31:29 +01:00
gRoussac 66f314bbb2 // missing trailing bracket in modules/productcomments/config.xml 2013-11-04 14:31:15 +01:00
gRoussac b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
gRoussac 9ea79f8cb5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 11:48:25 +01:00
gRoussac ad555f1d30 [-] IN : Follow up #PSCFV-10671 update messages in base and https://github.com/PrestaShop/PrestaShop/commit/b16e4b5a8ee6bdab13808f8ab473bda6c060c086 2013-11-04 11:10:40 +01:00
Gregory Roussac 4b6ee72072 Merge pull request #894 from codeurWeb/patch-6 
[-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
 2013-11-04 02:02:10 -08:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
gRoussac 2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical 2013-11-03 14:55:25 +01:00
gRoussac b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop 2013-11-03 01:49:16 +01:00
gRoussac 8f72282594 [-] IN : update_customer_default_group returning false 2013-11-02 21:51:13 +01:00
gRoussac a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading 2013-11-02 20:39:53 +01:00
gRoussac 062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade 2013-10-31 19:24:41 +01:00
gRoussac 80c60be952 [-] BO : Do not enable rewrite url for index 2013-10-31 16:20:55 +01:00
gRoussac f9dc0b0252 [-] MO : Could not translate in transit mail, revert from https://github.com/viger-creator/PrestaShop/commit/3213b5dffb266ddb0639b94f72babd892328ffa2 2013-10-31 14:20:21 +01:00
gRoussac 036fa7cba6 [-] FO : Fix bug #PSCFV-10889 wrong color when oos product 2013-10-31 10:18:28 +01:00
gRoussac f919cc899d [-] IN : Set conversion rate to 1 if equal 0 in base 2013-10-30 20:06:47 +01:00
gRoussac fbdddba753 [-] IN : Set default conversion rate to 1 not 0 2013-10-30 19:03:36 +01:00
gRoussac cbfa8dfc30 // forgot to commit in https://github.com/PrestaShop/PrestaShop/commit/f78cde96d633f65ece5700d2bc9793f134bdb7e6 2013-10-30 19:02:24 +01:00
gRoussac 8547f663d1 [-] BO : AdminImport withdraw separator changed in js 2013-10-30 18:46:02 +01:00
gRoussac 372130f7d7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-30 18:37:46 +01:00
gRoussac f78cde96d6 [-] BO : AdminImport wrong group by default 2013-10-30 18:37:26 +01:00
gRoussac 56799f53c8 [-] Bo : AdminImport customer group default 2013-10-30 17:12:20 +01:00
gRoussac b311a0c719 [-] BO : Fix bug #PSCFV-10872 AdminImport could not import supllier orders 2013-10-30 16:06:38 +01:00
gRoussac 9ef10ee806 [-] IN : Handle RC PHP_VERSION 2013-10-30 15:03:07 +01:00
gRoussac 8953c55b7f [-] BO : Adminimport default customers group 2013-10-30 12:30:22 +01:00
gRoussac 26b4fbf883 [*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2 2013-10-29 19:07:31 +01:00
gRoussac c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
Gregory Roussac 90bef56c84 Merge pull request #907 from djfm/development 
// Frenglish
 2013-10-29 08:24:45 -07:00
gRoussac 75cde08776 // update conf message in AdminImport 2013-10-29 16:16:55 +01:00
gRoussac c6319a754e [-] BO : Stats are empty when no conversion rate 2013-10-29 16:04:15 +01:00
Gregory Roussac f58526c701 Merge pull request #905 from PhpMadman/RMARef 
[-] BO : Order-follow displayed order id instead of order reference
 2013-10-29 07:44:26 -07:00
gRoussac a43851469e [-] CORE : Currency conversion rate can not be 0 2013-10-29 15:39:17 +01:00
gRoussac d409614222 [-] FO : CustomerMessage ip_address to string 2013-10-29 11:18:53 +01:00
gRoussac 1bee84d26c [-] BO : Do not delete other default jpg when _deleteOldImages and type defined 2013-10-29 10:57:33 +01:00
gRoussac af61191a7e // rename field Action when out of stock 2013-10-29 10:55:46 +01:00
Gregory Roussac b885c63564 Merge pull request #900 from kpodemski/patch-10 
[*] MO: productcomments optimization
 2013-10-29 02:06:56 -07:00
Gregory Roussac d74291e5b5 Merge pull request #901 from kpodemski/patch-11 
[*] MO: blocksharefb optimization
 2013-10-29 02:06:25 -07:00
gRoussac 0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
gRoussac 79cba4b655 [-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart 2013-10-28 19:00:00 +01:00
gRoussac e86c56172d [*] FO: Can not establish purchase total when tax incl. 2013-10-28 17:42:23 +01:00
Gregory Roussac 12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri 
[-] MO : homeslider stores slider about multistore with virtual uri
 2013-10-28 06:53:41 -07:00
gRoussac 4103339f53 [-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502 2013-10-28 11:21:25 +01:00
Gregory Roussac 9a879bc133 Merge pull request #897 from freedayko/development 
[*] BO : improved unicode characters replacement in URLs
 2013-10-28 03:09:16 -07:00
gRoussac e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend 2013-10-27 23:31:36 +01:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
gRoussac 9a3cfece69 //missing line feed after disable_modsec 2013-10-27 16:05:55 +01:00
gRoussac c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
gRoussac 4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
gRoussac 025b62f995 // norms 2013-10-25 17:33:44 +02:00
Gregory Roussac 6359c1ca33 Merge pull request #893 from neemzy/development 
[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
 2013-10-25 07:42:59 -07:00
gRoussac eb8ea1cba5 [-] CORE : SetEnv in if statement 2013-10-25 15:29:15 +02:00
gRoussac 4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-25 15:21:55 +02:00
gRoussac a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces 2013-10-25 15:21:40 +02:00
gRoussac 942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac 1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac a9643c80c3 // bad commit sorry 2013-10-24 22:45:43 +02:00
gRoussac 438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update 2013-10-24 22:42:13 +02:00
gRoussac 4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
gRoussac 97ef888345 [-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled 2013-10-24 21:28:22 +02:00
Gregory Roussac 4207bdff32 Merge pull request #890 from indesign47/patch-14 
[-] BO : AdminImport change width height depth
 2013-10-24 09:43:54 -07:00
gRoussac 759fe2f671 // norms 2013-10-24 18:09:21 +02:00
Gregory Roussac 0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728 
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
 2013-10-24 09:06:43 -07:00
gRoussac c5324a653b [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x 2013-10-24 16:31:50 +02:00
Gregory Roussac 65401efcb6 Merge pull request #887 from indesign47/patch-13 
[*] BO : AdminImport add img manufacturers-suppliers
 2013-10-24 07:22:57 -07:00
gRoussac 2ffc296279 FO : https://github.com/PrestaShop/PrestaShop/pull/878 2013-10-24 12:03:33 +02:00