dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,846 Commits 9 Branches 19 Tags
fa804b9bf8faa91ee973be4e4d28963280df44ff
Commit Graph

6933 Commits

Author SHA1 Message Date
gRoussac f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 2013-12-04 12:14:51 +01:00
Damien Metzger de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
Jerome Nadaud 8bf49049eb // Prevent click event in tree toolbar buttons 2013-12-02 19:07:28 +01:00
rGaillard 78a6821b2f // handle img extensions in the end of query string in the dispatcher 2013-12-02 16:14:27 +01:00
gRoussac aea8f0285e [-] FO : Fix bug #PSCFV-11190 double escaping on customization 2013-12-02 15:51:29 +01:00
Damien Metzger c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +01:00
Jerome Nadaud 0448ee697f // Merging PR 1070 from DevNet 2013-12-02 15:23:29 +01:00
Damien Metzger 62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 2013-12-02 10:06:44 +01:00
Damien Metzger 6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 2013-12-02 09:25:41 +01:00
rGaillard e0fd879037 [-] BO: Add some useful hooks to modify the listings/options/forms 2013-11-29 18:18:17 +01:00
Damien Metzger 4c2190ddc5 [-] Core : integrated modified pull request https://github.com/ExploZe/PrestaShop/commit/40abb0aa72607ddfe912b364d8fc7d65733d2bd8 2013-11-29 17:18:18 +01:00
Damien Metzger 9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +01:00
rGaillard 5c3f43141b // small fix 2013-11-29 14:20:06 +01:00
Jerome Nadaud e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
gRoussac d46feffcf1 [*] CORE : Throw Exception when no theme selected only in front office 2013-11-28 16:14:30 +01:00
gRoussac 336e784ca5 [*] CORE : Throw Exception when no theme selected 2013-11-28 15:32:19 +01:00
Jerome Nadaud b66f8ea75a // Allow list disabled categories 2013-11-28 14:49:41 +01:00
Jerome Nadaud 9b241d5e1d // Add interface restriction in Autoload 2013-11-28 11:46:03 +01:00
gRoussac 8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Jerome Nadaud 510b71054a // Add Drag and Drop to uploader helper 2013-11-28 09:55:22 +01:00
gRoussac 82022c337a [-] FO : CCC do not withdraw \t+ and \s+ 2013-11-27 19:49:07 +01:00
Damien Metzger 8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing 2013-11-27 17:40:35 +01:00
Kevin Granger 8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
gRoussac 10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 2013-11-27 00:06:44 +01:00
gRoussac 5f5b9bd1de [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718 2013-11-26 23:43:49 +01:00
gRoussac 5d511c1ac7 // remove notice in ModuleGraph.php 2013-11-26 23:39:28 +01:00
gRoussac ef466ac47c [+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775 2013-11-26 23:33:24 +01:00
gRoussac 1855ffa584 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813 2013-11-26 23:18:00 +01:00
gRoussac 8d15f5d3e6 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814 2013-11-26 23:08:03 +01:00
gRoussac 13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
Jerome Nadaud dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
Damien Metzger 9ad56871de Merge pull request #1004 from djfm/bootstrap 
// when adding a translation pack, do not install translations for modules that are not on the disk
 2013-11-26 01:31:24 -08:00
Jerome Nadaud 48be09d82d // Missing Base uri in uploader helper 2013-11-25 17:37:26 +01:00
gRoussac 620441997c [-] CORE : No Exception when CONTENT_LENGTH is no set 2013-11-25 16:05:07 +01:00
ccauw eb312455e5 [-] BO : Double separator in function createTemplate() 
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
 2013-11-25 14:19:21 +01:00
Jerome Nadaud 3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
Damien Metzger db1c3c22fd [-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked) 2013-11-22 15:59:52 +01:00
Damien Metzger 40d15416c5 [-] FO : exclude external css from CCC #PSCFV-10839 2013-11-22 14:37:27 +01:00
gRoussac dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
Damien Metzger 3a02d6f281 [-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104 2013-11-21 17:46:28 +01:00
Kevin Granger 9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
Damien Metzger 9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger 26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
gRoussac d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-21 14:20:00 +01:00
gRoussac 3ab28374e6 [-] BO : Remove warning with open_basdir on module list 2013-11-21 14:17:55 +01:00
Damien Metzger 9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Fabio Chelly 5f47526ed2 [-] FO : Fixed bug #PSCFV-11076 2013-11-21 12:13:30 +01:00
fram 5a9bb5106f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 10:16:47 +01:00
fram 64e84ff296 // when adding a translation pack, do not install translations for modules that are not on the disk 2013-11-20 17:35:09 +01:00
Damien Metzger 63f2082da3 [-] FO : fixed tax rules cache 2013-11-20 16:49:48 +01:00