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
e5276ff531
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +02:00
e9dbadcabf
// Tree
2013-09-11 20:41:14 +02:00
9fa6c86a94
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 20:05:13 +02:00
f4f3084c35
[-] Core: Set a remote addr with php-cli #PSCFV-10372
2013-09-11 16:40:33 +02:00
a4d131eac9
[-] WS: Fix entities retrieve for some cases
2013-09-11 16:32:11 +02:00
e2dac03baa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 16:30:52 +02:00
dfdbe39ee3
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02:00
31c94caebc
[-] BO: Fix out of stock creation with multishop and stock sharing
2013-09-11 16:22:13 +02:00
669c3791b5
[-] BO: Fix preview url with multishop
2013-09-11 15:55:25 +02:00
3e750490fe
// chmod class_index 666 instead of 664
2013-09-11 15:16:15 +02:00
49c9afec40
// Categories tree
2013-09-11 15:08:24 +02:00
01be908e51
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
9f12ff15be
[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
2013-09-11 10:30:40 +02:00
85a471a690
//bad commit , sorry for that
2013-09-10 18:51:20 +02:00
86d3a8afe1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-10 18:49:05 +02:00
f94f0f14a4
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
e0d33eae9e
// Categories Tree changes
2013-09-10 18:40:05 +02:00
9713f93075
Add Bcc support in Mail class
2013-09-10 17:11:34 +02:00
85dc552667
// Toolbar
2013-09-10 14:08:29 +02:00
332d68c7ec
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +02:00
3c090535a9
// small fix for image SSL links
2013-09-10 10:39:03 +02:00
021790a3e2
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
1d8da79507
[-] BO : fixed notifications when there is too much data
2013-09-10 09:17:54 +02:00
e91460b8fe
[-] BO : Change Nested categories
2013-09-09 18:58:32 +02:00
4e8658f1d6
[+] BO : Helper Tree js improvement
2013-09-09 18:57:42 +02:00
242556e176
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
2013-09-09 15:12:26 +02:00
accd2d77c1
[+] BO : Adding tree templates and functions
2013-09-09 12:20:58 +02:00
6ea3783013
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-09 09:46:49 +00:00
dcad699ede
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
e1d0347757
[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
2013-09-09 10:17:15 +02:00
6b03af9ef9
[-] BO : ini_get('safe_mode') can return false
2013-09-08 22:26:21 +02:00
e6f8dba2e6
// remove Notice: Undefined index
2013-09-08 19:55:03 +02:00
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
makk1ntosh