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

98 Commits

Author SHA1 Message Date
Damien Metzger
9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +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
gRoussac
de404706d9 [*] CORE : Profiling hide non doubles 2013-11-11 02:09:50 +01:00
Rémi Gaillard
9817ef6840 // small fix on profiling 2013-11-05 11:54:22 +01:00
Damien Metzger
4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
Damien Metzger
3669948547 // Revert to the previous lib with a trick 2013-10-31 17:53:34 +01:00
Damien Metzger
1ecc6e32ba // Try out new PEAR JSON encode 2013-10-31 17:45:02 +01:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Damien Metzger
d914982961 // Rounded sales on dashboard 2013-09-12 19:26:38 +02:00
gRoussac
e6d0a3e5a4 // revert form 2874f14983 2013-09-09 15:11:55 +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
Damien Metzger
2ff2a6b6f9 // Profiling adapted to the new dashboard 2013-09-05 17:28:05 +02:00
Rémi Gaillard
1196c5d736 // php 5.2 2013-08-29 16:39:45 +02:00
gRoussac
5123d2505e [-] CORE : Do not delete index.php in smarty cache or /img/tmp/ 2013-08-13 16:29:40 +02:00
Francois Gaillard
7e7b5af26e // Profiler fixed 2013-08-01 17:21:38 +02:00
Jérôme Nadaud
b88ddf4483 [-] Classes : SwiftMailer - Fix deprecated preg_replace (PHP 5. 5.0) 2013-07-22 15:39:50 +02:00
Damien Metzger
f76fe635ff // Added queries table to the profiling mode, you can easily copy/paste it into excel or anything 2013-07-22 11:37:29 +02:00
Damien Metzger
92959311d9 [*] Core : Smarty updated from 3.1.13 to 3.1.14 (cache issues fixed) 2013-07-02 18:45:07 +02:00
Damien Metzger
f204f80c99 // Improved profiling tool 2013-07-02 11:08:24 +02:00
Damien Metzger
d05968823e // Try to fix warning 2013-07-02 10:46:46 +02:00
Rémi Gaillard
f0c5407aa6 // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Andrew
5ab4c18396 Remove spaces before and after dot 2013-04-16 13:43:24 +04:00
Andrew
8445bb4a94 And in profiler too 2013-04-02 16:26:41 +04:00
gRoussac
1ee78f5cad [*] BO: More detailled errors when using Archive tar tool 2013-03-25 12:12:38 +01:00
djfm
adf6786d40 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk 2013-03-20 14:13:37 +01:00
François Gaillard
ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
François Gaillard
da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Damien Metzger
7f21c3e62a // Update profiling tools 2013-03-14 10:47:18 +01:00
François Gaillard
890eefce92 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
Rémi Gaillard
ac8e96dd4f [-] Core: Fix TCPDF encoding for some languages like japan #PSCFV-8096 2013-03-04 14:38:51 +01:00
Rémi Gaillard
2011cdb735 [-] FO: Fix #PSCFV-7850 sometimes minify_html lib was returned nothing... 2013-02-28 17:54:51 +01:00
Rémi Gaillard
b28ddac3c0 [-] Core: Mobile_Detect library upgrade to 2.5.5 2013-02-25 17:36:35 +01:00
Rémi Gaillard
0cd1033527 // Delete empty override files - use IO/s for nothing 2013-02-15 18:04:52 +01:00
Damien Metzger
725a3f9759 // htmlspecialchars on the sql queries in the profiling mode 2013-02-13 15:39:22 +01:00
Rémi Gaillard
ec98e4630f [-] Core: upgrade smarty to 3.1.13 2013-02-13 14:30:45 +01:00
Damien Metzger
b865fc2e70 // Fixed profiling tool 2013-01-30 10:17:00 +01:00
Damien Metzger
fff961f9b6 // Fixed profiling tool 2013-01-30 10:15:39 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
3fd4fd6f70 [-] Core : maxmind geoip API was outdated #PSCFV-5941 2012-12-14 15:29:35 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Damien Metzger
8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rGaillard
2a7289daa6 // Fix #PSCFV-4190 2012-10-05 16:28:59 +00:00
dMetzger
954a72f86a // hack following up the previous one (in the same file) 2012-09-26 13:14:29 +00:00
rGaillard
12afff4b12 // Fix PDF generation on some hostings 2012-09-13 16:22:57 +00:00