7b0349ca33
// bad commit sorry for that
2013-09-04 11:14:45 +02:00
efa81a7107
[-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0
2013-09-04 11:14:00 +02:00
da353c884d
[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
2013-09-04 10:45:48 +02:00
df56d7af42
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
5d38743b72
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
...
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
75a663b6e3
[-] BO : Fix pull request #665
2013-09-04 09:40:12 +02:00
f4892686c1
Warning in AdminController.php
...
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.
Warning: simplexml_load_file()
1: parser error : Document is empty
2013-09-03 17:30:05 -07:00
b55a84e961
[-] INSTALLER : Fix infinite loop when order message has additional ampersand
2013-09-03 18:36:30 +02:00
6daf8ebbfa
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
5d8e187faa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-03 17:43:51 +02:00
0891c986d6
// fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919
2013-09-03 17:43:33 +02:00
8fedbe189c
Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup
...
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 06:41:06 -07:00
cd7d604b75
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 15:10:06 +02:00
5caae97813
Merge pull request #680 from djfm/development
...
// fixed unstranslatable string in AdminSupplyOrdersController
2013-09-03 06:00:50 -07:00
572a2e45aa
// fixed unstranslatable string in AdminSupplyOrdersController
2013-09-03 12:51:21 +00:00
98f60d039b
// fix warning
2013-09-03 12:29:17 +02:00
656717fb4c
Merge pull request #679 from kluevandrew/patch-3
...
[*] BO : Cursor "pointer" for .button class
2013-09-03 00:51:38 -07:00
e08c8b2d25
Merge pull request #674 from PrestaEdit/patch-50
...
[*] BO: sort modules name in Stats
2013-09-03 00:49:11 -07:00
97f1db480a
BO: Cursor "pointer" for .button
...
Cursor "pointer" for each button in back office
2013-09-03 11:35:50 +04:00
c3772fb355
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-02 19:11:17 +02:00
da12fbdd5e
[-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes
2013-09-02 19:09:47 +02:00
94bdde4630
[-] CORE : Remove PHP Warning: file_put_contents on modules config.xml
2013-09-02 18:19:21 +02:00
abf5ad195c
Merge pull request #676 from dlage/patch-1
...
[*] MO : blocknewproducts avoid $newProducts not defined
2013-09-02 08:58:32 -07:00
b2ccf88296
Merge pull request #663 from sjousse/patch-1
...
[-] MO : Shopimporter file_exists does not exists in Validate Class
2013-09-02 08:21:42 -07:00
f7eb6b3a16
Merge pull request #665 from Ha99y/Get-Combination-Images
...
[*] CLASSES : Add $id_product_attribute param to Image::getImages
2013-09-02 08:11:48 -07:00
6059b4301a
// states list
2013-09-02 17:10:20 +02:00
36d9e0eed5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-02 16:28:56 +02:00
c6d2e1252e
[-] INSTALLER : Fix fatal error in upgrade, could not load configuration class
2013-09-02 16:28:38 +02:00
fe209e0c55
Merge pull request #678 from gr4devel/patch-5
...
[*] BO : add TinyMCE editor for supplier descrpition in AdminSuppliers
2013-09-02 06:03:20 -07:00
f535d60a29
[-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController
2013-09-02 14:24:18 +02:00
36ca7f294a
[+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier
2013-09-02 14:15:33 +02:00
477457a44f
Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1
2013-09-02 12:03:01 +02:00
6177589cd3
[+] MO : add link to all manufacturer page and the feature to show All Suppliers
2013-09-02 11:57:16 +02:00
4853772198
[-] INSTALLER : no update value in fix_download_product_feature_active
2013-09-02 11:33:53 +02:00
62303e58df
[-] INSTALLER : Fix fatal error when upgrading
2013-09-02 11:24:46 +02:00
82939730dd
Merge pull request #667 from Ha99y/Small-Autoload-Fix
...
[-] CORE : Remove warning on rename on index.php
2013-09-02 02:11:51 -07:00
397e42637a
// norms
2013-09-02 10:49:50 +02:00
6dc0edec3a
Merge pull request #668 from lrosset/development
...
[-] CORE : Add APCu support
2013-09-02 01:46:25 -07:00
d019500d81
Merge pull request #670 from gr4devel/patch-2
...
[+] FO : add getManufacturer() to ManufacturerControllerCore
2013-09-02 01:31:14 -07:00
00afa8ae47
Merge pull request #671 from gr4devel/patch-3
...
[+] BO : enable TinyMCE editor for short and long descrpition in AdminManufacturers
2013-09-02 01:09:10 -07:00
a013be8380
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
...
Conflicts:
modules/blockcart/ajax-cart.js
2013-09-02 10:00:24 +02:00
a436456fa4
Merge pull request #673 from sagaradonis/development
...
[*] FO : Deprecated .size() to .length
2013-09-02 00:31:05 -07:00
dlage
5f1e08e7e2
Fix variable context
...
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
2013-09-01 22:47:41 +01:00
4c633b8b46
[*] BO: sort modules name in Stats
2013-09-01 16:55:22 +02:00
9cd73b411d
Update ajax-cart.js
...
.size() replaced by .length as .size() is outdated
2013-08-31 19:05:14 +05:30
805e80e54c
[+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController
2013-08-30 21:24:21 +02:00
f7fefe789d
// typo fix
2013-08-30 11:21:00 +02:00
37e3b9e9e4
[-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229
2013-08-30 11:13:30 +02:00
b72f2a7176
[+] FO : add getManufacturer() to ManufacturerControllerCore
...
Add getManufacturer() to ManufacturerControllerCore to access the protected manufacturer instance of the controller.
2013-08-29 21:48:32 +02:00
39c8a8fc2d
[+] MO : add the option to show all Manufacturer
...
Add the option to show all Manufacturer in blocktopmenu module.
2013-08-29 21:32:10 +02:00
gRoussac
dlage