a578cfb2e2
[-] FO: Fix #PSCFV-10461
2013-09-23 10:20:22 +02:00
39468476ab
[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
2013-09-23 09:50:12 +02:00
e9cd8ac145
// Search tree toolbar button
2013-09-20 16:20:27 +02:00
7aa348eb93
// bad char
2013-09-20 15:48:22 +02:00
429c9442a3
[*] CORE : bad else if in getTemplatePath
2013-09-20 15:10:14 +02:00
f312a055b1
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
9b878a33a8
// fix canonical and ssl page without ssl
2013-09-20 14:12:41 +02:00
e2ac223f4e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-20 11:34:54 +02:00
5b7580d487
[-] MO: Fix time of smarty cache invalidation
2013-09-20 11:33:30 +02:00
1cebd5920e
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
f8ca06d927
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
150b68b96b
//displayError & displayConfirmation use bootstrap design
2013-09-19 16:52:58 +02:00
0a9f425281
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 16:08:44 +00:00
4e1d6de9b0
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
2013-09-18 17:57:00 +02:00
75a9629b8a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 17:23:23 +02:00
27f14b9a31
[-] BO : Fix proces and save buttons for Modules and AdminControllers
2013-09-18 17:23:08 +02:00
f6dc81d0f1
// small fix for SSL
2013-09-18 17:19:03 +02:00
0452979ce7
[*] FO: Allow to enable SSL on all the pages
2013-09-18 16:30:34 +02:00
93aae26269
[-] Bo : Modules 'save' button not active
2013-09-18 15:41:30 +02:00
39fdc8c926
[+] BO : Added new class ConfigurationKPI for KPI cache storage
2013-09-18 15:09:04 +02:00
5a206e83a8
// Security
2013-09-18 10:43:58 +02:00
f7855f2a3a
// Always more KPIs
2013-09-17 12:47:13 +02:00
e6e8efc19a
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
2013-09-17 11:58:12 +02:00
6ee6317fee
// orderby position
2013-09-17 11:07:29 +02:00
2d5bd901f4
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
2013-09-16 18:51:06 +02:00
8934f9c7ed
[*] BO : Connected the first KPIs to real data
2013-09-16 18:40:34 +02:00
15dd1cf96f
[-] BO : Fix bugPSCFV-10249 images copy when unix path
2013-09-16 17:16:11 +02:00
235af94a92
// Fix Page header toolbar
2013-09-16 17:05:27 +02:00
7e8d119213
// Textarea autosize
2013-09-16 14:25:49 +02:00
e68c124218
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
2013-09-16 11:42:11 +02:00
e0739ea1e0
Merge pull request #720 from makk1ntosh/development
...
//Added ui.button as dependency of ui.dialog
2013-09-16 01:35:25 -07:00
c0afb55d11
[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
2013-09-16 09:25:10 +02:00
74237ff694
// Some fix
2013-09-13 17:11:12 +02:00
d0ef8cca8f
Added ui.button as dependency of ui.dialog
...
While developing my own module, i've upgraded installation to latest version of PS and impacted a bug:
$('#something').dialog({...}); caused an error: t().button is not a function.
In my php code i had this:
$this->context->controller->addJqueryUI('ui.dialog');
i found that it doesn't load ui.button dependency.
Added 'ui.button' to classes/Media.php at the end of ui.dialog dependencies and all worked fine.
2013-09-13 08:02:47 -07:00
0ba9704c21
// Fix class index error
2013-09-13 12:17:24 +02:00
5363e75238
// small fix
2013-09-13 12:13:12 +02:00
4f06b74a29
Update Connection.php correction from 717
...
I'm very very sorry, I produced an error with the last commit on this file: there was an error in parenthesis position on line 117. Line 117 should be as line 131.
(But how did I manage to make this wrong ???)
2013-09-13 11:56:50 +02:00
968f2a45d5
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:26 +02:00
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
452f41df8d
Speeding up sql queries
...
Searching for "DATE_ADD(date_add, INTERVAL 30 MINUTE) > now" needs for every line to add 30 minutes to the date. but it is the same operation as comparing "date_add > (now - 30 minutes).
It is faster because there is no DATE_ADD calculation.
The problem:
By profiling speed of my shop, this query appeared after about 3 months always as the absolute slowest query of the shop, needing about 15 to 30 ms to perform, because I have now nearly 700 connections to my shop (and it then browses the 700 lines)
A solution:
Removing DATE_ADD MySql function and using date() and time() functions of php for calculating only once the 30 min. difference.
Using this solution takes it down again to 0.8 to 1.3 ms.
I guess it is the same in case of bots (could be even worse as they can make thousands of connections).
2013-09-13 10:05:30 +02:00
f20fa55308
// Fix filter by category checkbox
2013-09-13 09:49:07 +02:00
06a178b8fe
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
14a9d914d8
// Fix module uninstall button
2013-09-12 18:23:27 +02:00
29db737c10
// Add autosize to textarea
2013-09-12 16:52:55 +02:00
c105486fa3
// Tree bugs
2013-09-12 15:22:47 +02:00
5095b45e47
[-] BO : Fix bug, orders states not ordered by order state name
2013-09-12 15:09:21 +02:00
30591b7c28
// Typo
2013-09-12 15:04:47 +02:00
f9b1f0ab5e
[*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists()
2013-09-12 15:03:23 +02:00
873eee8ad0
// Tree list bug
2013-09-12 14:55:45 +02:00
e63ce0a86d
// Tree
2013-09-12 14:47:47 +02:00
Rémi Gaillard