10472ef83c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-13 17:57:06 +02:00
6da1228359
[-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed
2013-09-13 17:56:45 +02:00
97ec6341e8
[-] BO ; Fix bug #PSCFV-10393 manufacturer filter
2013-09-13 15:39:30 +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
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
db4b69d10c
[-] BO : Customer message twice encoded
2013-09-12 18:03:30 +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
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
e5276ff531
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +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
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
a37033e478
[-] MO : Fixed a bug when displaying textures
...
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +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
4a3e0c5075
// Updated README.md
2013-09-11 16:11:28 +02:00
c42d71b8f5
// oups
2013-09-11 16:06:23 +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
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
53805f2b93
Merge pull request #712 from Prestaworks/patch-13
...
[-] MO : Customization data is not included in new order email.
2013-09-11 00:58:30 -07:00
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08: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
31d762b88a
Merge pull request #710 from nilsga/development
...
[*] CORE : Add Bcc support in Mail class
2013-09-10 09:24:04 -07:00
9713f93075
Add Bcc support in Mail class
2013-09-10 17:11:34 +02:00
c5afbc75bd
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-10 12:01:38 +02:00
332d68c7ec
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +02:00
f30a088848
[*] MO : MailAlerts : Add SQL update script for v2.5
2013-09-10 11:01:11 +02:00
3c090535a9
// small fix for image SSL links
2013-09-10 10:39:03 +02:00
c4681c1fb1
[*] MO : MailAlerts : multishop/multilang full compatibility
...
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)
SQL update table : `ps_mailalert_customer_oos`
=========================================
ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
2013-09-10 10:24:40 +02:00
021790a3e2
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
gRoussac