Rémi Gaillard
e6e8efc19a
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
2013-09-17 11:58:12 +02:00
Rémi Gaillard
6ee6317fee
// orderby position
2013-09-17 11:07:29 +02:00
gRoussac
2d5bd901f4
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
2013-09-16 18:51:06 +02:00
gRoussac
b9b4265517
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-16 17:18:56 +02:00
gRoussac
15dd1cf96f
[-] BO : Fix bugPSCFV-10249 images copy when unix path
2013-09-16 17:16:11 +02:00
Gregory Roussac
1c58c1ea6b
Merge pull request #726 from cinscaen/patch-1
...
[-] BO : Move product images in POST method in admin.js
2013-09-16 07:01:45 -07:00
CINS
852faeab7a
Update admin.js
...
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
2013-09-16 15:57:44 +02:00
gRoussac
8504574ae1
[-] IN : Could not remove some tabs
2013-09-16 15:02:12 +02:00
Damien Metzger
e68c124218
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
2013-09-16 11:42:11 +02:00
gRoussac
08efa4e313
[-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists
2013-09-16 11:12:55 +02:00
Vincent Augagneur
e0739ea1e0
Merge pull request #720 from makk1ntosh/development
...
//Added ui.button as dependency of ui.dialog
2013-09-16 01:35:25 -07:00
Damien Metzger
0e3d53321a
[-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error
2013-09-16 09:56:22 +02:00
Jerome Nadaud
d7c1cd90bf
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-16 09:25:57 +02:00
Jerome Nadaud
c0afb55d11
[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
2013-09-16 09:25:10 +02:00
Gregory Roussac
3b9c125198
Merge pull request #723 from codeurWeb/patch-2
...
[+] MO : Blocknewproducts add hookHome
2013-09-14 08:58:14 -07:00
Julien
08373c0541
[+] Modules : add hookHome
2013-09-14 14:57:00 +02:00
gRoussac
73dd524de8
[-] BO : Could not order in AdminStatuses by ID or template
2013-09-14 00:05:45 +02:00
gRoussac
10472ef83c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-13 17:57:06 +02:00
gRoussac
6da1228359
[-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed
2013-09-13 17:56:45 +02:00
makk1ntosh
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
Jerome Nadaud
97ec6341e8
[-] BO ; Fix bug #PSCFV-10393 manufacturer filter
2013-09-13 15:39:30 +02:00
Rémi Gaillard
5363e75238
// small fix
2013-09-13 12:13:12 +02:00
Gregory Roussac
a3d9643833
Merge pull request #719 from zimmi1/patch-4
...
Update Connection.php correction from 717
2013-09-13 02:59:06 -07:00
zimmi1
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
Gregory Roussac
61295e4e21
Merge pull request #717 from zimmi1/patch-2
...
[*] CORE : Speeding up sql queries in Connection
2013-09-13 02:09:25 -07:00
gRoussac
d9bc07d030
[-] BO : quote badly decoded in customerThreads
2013-09-13 10:45:07 +02:00
Jerome Nadaud
3eb4d65fc9
[-] BO : Fix Bug #PSCFV-10331 check all from list
2013-09-13 10:26:08 +02:00
zimmi1
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
gRoussac
db4b69d10c
[-] BO : Customer message twice encoded
2013-09-12 18:03:30 +02:00
gRoussac
5095b45e47
[-] BO : Fix bug, orders states not ordered by order state name
2013-09-12 15:09:21 +02:00
Rémi Gaillard
30591b7c28
// Typo
2013-09-12 15:04:47 +02:00
Rémi Gaillard
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
Francois Gaillard
cc36eb2d27
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 14:32:22 +02:00
Francois Gaillard
53c1e56c51
[-] BO : Bug fix - Encoding & tips of the day
2013-09-12 14:32:02 +02:00
Gregory Roussac
8590b0e699
Merge pull request #716 from romainberger/typos
...
[*] FO : removed extra slash and point
2013-09-12 05:30:36 -07:00
romainberger
876be3b452
[*] FO : removed extra slash and point
2013-09-12 14:07:45 +02:00
gRoussac
e5276ff531
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +02:00
gRoussac
90091d4f2c
[-] BO : Do not copy link_rewrite from title if cms already has one
2013-09-12 10:50:04 +02:00
gRoussac
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
Rémi Gaillard
ea1bdbc849
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 10:01:39 +02:00
Gregory Roussac
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
Gregory Roussac
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
Prestaspirit
a37033e478
[-] MO : Fixed a bug when displaying textures
...
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +02:00
Rémi Gaillard
9fa6c86a94
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 20:05:13 +02:00
Rémi Gaillard
f4f3084c35
[-] Core: Set a remote addr with php-cli #PSCFV-10372
2013-09-11 16:40:33 +02:00
Rémi Gaillard
a4d131eac9
[-] WS: Fix entities retrieve for some cases
2013-09-11 16:32:11 +02:00
gRoussac
e2dac03baa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 16:30:52 +02:00
gRoussac
dfdbe39ee3
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02:00
Rémi Gaillard
31c94caebc
[-] BO: Fix out of stock creation with multishop and stock sharing
2013-09-11 16:22:13 +02:00
Damien Metzger
4a3e0c5075
// Updated README.md
2013-09-11 16:11:28 +02:00