0ba9704c21
// Fix class index error
2013-09-13 12:17:24 +02:00
5363e75238
// small fix
2013-09-13 12:13:12 +02:00
a3d9643833
Merge pull request #719 from zimmi1/patch-4
...
Update Connection.php correction from 717
2013-09-13 02:59:06 -07: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
2bf17241bd
// Fix associated categories tree header
2013-09-13 11:50:27 +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
61295e4e21
Merge pull request #717 from zimmi1/patch-2
...
[*] CORE : Speeding up sql queries in Connection
2013-09-13 02:09:25 -07:00
d9bc07d030
[-] BO : quote badly decoded in customerThreads
2013-09-13 10:45:07 +02:00
3eb4d65fc9
[-] BO : Fix Bug #PSCFV-10331 check all from list
2013-09-13 10:26:08 +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
ce74aeb357
// nav
2013-09-13 09:35:36 +02:00
d914982961
// Rounded sales on dashboard
2013-09-12 19:26:38 +02:00
7d9f9a7bfc
// Fix CMS missing Page header toolbar
2013-09-12 19:21:53 +02:00
3cf4dc76b5
// Fix missing localizations page header toolbar
2013-09-12 18:54:28 +02:00
06a178b8fe
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
f20a3eb9b5
// Fixed most viewed conversion rate
2013-09-12 18:24:18 +02:00
26babfc8f9
// Binded most viewed products on analytics
2013-09-12 18:24:17 +02:00
481dc3d307
// Dashboard is almost complete
2013-09-12 18:24:17 +02:00
278cd952e2
// Gapi choose between 1.3 and 3.0 versions
2013-09-12 18:24:17 +02:00
14a9d914d8
// Fix module uninstall button
2013-09-12 18:23:27 +02:00
db4b69d10c
[-] BO : Customer message twice encoded
2013-09-12 18:03:30 +02:00
81b6ec93f9
// Add count down to text input
2013-09-12 17:59:25 +02:00
039955e6a1
// Fix bug customer list in multistore
2013-09-12 16:59:25 +02:00
29db737c10
// Add autosize to textarea
2013-09-12 16:52:55 +02:00
ba6699a378
// Fix Admin access
2013-09-12 15:55:14 +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
bc221b993b
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-12 14:55:58 +02:00
873eee8ad0
// Tree list bug
2013-09-12 14:55:45 +02:00
c2d15f4ade
// Changed language display in back office dropdown menu
2013-09-12 14:53:12 +02:00
e63ce0a86d
// Tree
2013-09-12 14:47:47 +02:00
91d3da310b
// dashboard panel version
2013-09-12 14:42:20 +02:00
cc36eb2d27
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 14:32:22 +02:00
53c1e56c51
[-] BO : Bug fix - Encoding & tips of the day
2013-09-12 14:32:02 +02:00
8590b0e699
Merge pull request #716 from romainberger/typos
...
[*] FO : removed extra slash and point
2013-09-12 05:30:36 -07:00
876be3b452
[*] FO : removed extra slash and point
2013-09-12 14:07:45 +02:00
a1b0710f85
// fix menu + sass refacto
2013-09-12 12:26:08 +02:00
e5276ff531
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +02:00
4a6c5979a8
//added new useful links on dashboard
2013-09-12 10:52:56 +02:00
90091d4f2c
[-] BO : Do not copy link_rewrite from title if cms already has one
2013-09-12 10:50:04 +02:00
3870388e1c
Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop
...
Conflicts:
modules/mailalerts/mailalerts.php
2013-09-12 10:09:25 +02:00
6fa398e8e0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-12 10:08:32 +02:00
38822bfb5e
//dashactivity configuration
2013-09-12 10:08:28 +02:00
ea1bdbc849
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 10:01:39 +02:00
f0297824d7
Merge pull request #709 from AgenceNetDesign/development
...
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-12 00:56:36 -07:00
c91a86740f
Merge pull request #715 from Prestaspirit/patch-6
...
[-] MO : Blocklayered Fixed a bug when displaying textures
2013-09-12 00:55:28 -07:00
Jerome Nadaud