cf9c73a854
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-28 10:19:03 +02:00
ec3095ac32
[-] BO: Fix manufacturer addresses duplication #PSCFV-9601
2013-06-28 10:18:49 +02:00
32d3dd3e0f
[-] MO : fixed bug #PSCFV-8654 - 1.5.4.0 My Favorites doesn't add product
2013-06-28 10:13:09 +02:00
c025024b40
// fix php warning if no image is associated to the producr
2013-06-27 18:14:07 +02:00
ce7fe6c128
// Removed @ in front of a function (We need the errors!) #PSCFV-9078
2013-06-27 18:11:57 +02:00
8f01b35f46
[-] BO : fixed translation and languages issues
2013-06-27 17:51:25 +02:00
75cddbae99
// Protected smarty variable in JS
2013-06-27 16:41:57 +02:00
374de1b6c8
Merge pull request #515 from axometeam/patch-3
...
[-] BO : remove robots.txt rules preventing Google shopping indexing
2013-06-27 06:52:11 -07:00
0de8c2dbc6
Update OrderDetailController.php
...
Fixed link between thread and an order's product
2013-06-27 15:49:40 +02:00
9bafc25878
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-27 15:41:57 +02:00
17579de481
[-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers
2013-06-27 15:41:37 +02:00
6368409ec6
[-] BO : fixed addslashes on tpl translations (compatibility between "slashes" and "js" parameters) #PSCFV-9427
2013-06-27 15:30:30 +02:00
1f5c1927c6
Merge pull request #521 from misthero/patch-1
...
Update AdminCustomerThreadsController.php
2013-06-27 06:01:40 -07:00
a7885fef1c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-27 10:57:25 +02:00
13b7bc959e
[*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip
2013-06-27 10:56:50 +02:00
453bb826ef
[-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office
2013-06-27 10:19:22 +02:00
7f1b44f451
[-] INSTALLER : Remove warnings
2013-06-26 18:27:02 +02:00
3524ccc99b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-26 18:13:38 +02:00
e33e5229b4
[-] Installer: Fix some sql queries
2013-06-26 18:13:09 +02:00
2b94a338b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-26 18:12:09 +02:00
9e9a1761f5
[-] INTSALLER : Fix bug #PSCFV-8776 Mysql has gone away during upgrade
2013-06-26 18:08:05 +02:00
56e75d0e9a
[-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information
2013-06-26 18:01:26 +02:00
b8df8e6fb1
[-] Classes : Db : Fixed $link
2013-06-26 17:39:53 +02:00
8c5c7e1bb4
[-] MO : fixed bug #PSCFV-9040 - Block CMS Multishop bug
2013-06-26 17:31:04 +02:00
4c28d49487
[-] FO : fixed remove button for free product in the cart block #PSCFV-8465
2013-06-26 16:51:45 +02:00
57dd992c28
[-] FO : fixed entities issue in javascript alerts #PSCFV-9001
2013-06-26 16:22:57 +02:00
7427efdb6f
// Added addlashes for some js messages
2013-06-26 15:52:40 +02:00
19ee2c953f
[*] IN : removed the possibility to choose his own storage engine, automatically select the best one
2013-06-26 14:26:37 +02:00
9257dc80c2
[-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context
2013-06-26 14:17:45 +02:00
c01619dfe3
// Change administrator access fixture
2013-06-26 12:05:36 +02:00
3d2e46b14f
[-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times
2013-06-26 11:46:02 +02:00
c5e65e1360
[-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context
2013-06-26 11:38:08 +02:00
00ee8ad4ef
Update AdminCustomerThreadsController.php
...
$contact->name can be an array throwing a warning Warning: preg_match() expects parameter 2 to be string when answering to a customer
2013-06-26 10:32:54 +02:00
64f615a061
[-] BO : Fix warnings when product not available in Shop
2013-06-25 18:16:06 +02:00
699053da27
[-] FO : Fix bug #PSCFV-8412 no zipcode for countries when default country has no zip code in adress format
2013-06-25 16:17:58 +02:00
4627768092
[-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated
2013-06-25 15:51:24 +02:00
f73eb070ab
// small fix
2013-06-25 15:50:36 +02:00
502472dfba
[-] FO : fixed bug #PSCFV-7454
2013-06-25 15:47:46 +02:00
cc4c8bfbe7
[-] CORE : fixed bug #PSCFV-9460
2013-06-25 15:25:08 +02:00
b7c5201ad8
Merge pull request #512 from antoniofr/development
...
[-] FO : #PSCFV-9532 remove hardcoded unidentified group number
2013-06-25 06:06:05 -07:00
2b2d6762f2
[-] FO : Css fix on first address and avaibility
2013-06-25 14:47:27 +02:00
c8a67fbc40
[+] CORE : new jquery UI version (1.10.3)
2013-06-25 11:16:04 +02:00
4dbaf98cc8
[-] FO : Fix one_phone_at_leastphone again when PS_REGISTRATION_PROCESS_TYPE = 1 && PS_ORDER_PROCESS_TYPE =0
2013-06-25 10:44:41 +02:00
f2e08c9c94
Merge branch 'development' of https://github.com/djfm/PrestaShop into development
2013-06-25 08:41:35 +00:00
9b16761a68
[*] LO : corrected Israel standard tax rate
2013-06-25 08:37:54 +00:00
fe4b5eff1a
[-] BO : fixed bug #PSCFV-7634 - Add non-existent new product to order using autocomplete gives javascript error (data.products is not defined)
2013-06-25 10:37:17 +02:00
faa975750d
[-] MO : fixed bug #PSCFV-8910 - Productcomments module allows post only one comment per product
2013-06-25 10:26:13 +02:00
7f7cd3bdaa
[*] BO : Correct Request Sql Manager validate options
...
Correct Request Sql Manager validate options :
- No size limit for the request
- cutJoin() doesn't work for multiple Join (exemple : LEFT JOIN `XXX ON XXX AND XXX) => Then you can't save the request, even if it work
2013-06-25 11:01:01 +03:00
36c7b9df48
[-] BO: This is now not possible to move a tab with id_parent = 0 to an another tab
2013-06-24 18:25:38 +02:00
fd3ce0ba6c
[-] CORE: Fix bug #PSCFV-9474 missing unity and unit_price_ratio in Cart::getProducts
2013-06-24 17:23:09 +02:00
Rémi Gaillard