dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac
5caae97813 Merge pull request #680 from djfm/development 
// fixed unstranslatable string in AdminSupplyOrdersController
 2013-09-03 06:00:50 -07:00
djfm
572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController 2013-09-03 12:51:21 +00:00
gRoussac
98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Gregory Roussac
656717fb4c Merge pull request #679 from kluevandrew/patch-3 
[*] BO : Cursor "pointer" for .button class
 2013-09-03 00:51:38 -07:00
Gregory Roussac
e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 
[*] BO: sort modules name in Stats
 2013-09-03 00:49:11 -07:00
Andrew
97f1db480a BO: Cursor "pointer" for .button 
Cursor "pointer" for each button in back office
 2013-09-03 11:35:50 +04:00
Jerome Nadaud
c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 19:11:17 +02:00
Jerome Nadaud
da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
gRoussac
94bdde4630 [-] CORE : Remove PHP Warning: file_put_contents on modules config.xml 2013-09-02 18:19:21 +02:00
Gregory Roussac
abf5ad195c Merge pull request #676 from dlage/patch-1 
[*] MO : blocknewproducts avoid $newProducts not defined
 2013-09-02 08:58:32 -07:00
Gregory Roussac
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
Gregory Roussac
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
Rémi Gaillard
6059b4301a // states list 2013-09-02 17:10:20 +02:00
gRoussac
36d9e0eed5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 16:28:56 +02:00
gRoussac
c6d2e1252e [-] INSTALLER : Fix fatal error in upgrade, could not load configuration class 2013-09-02 16:28:38 +02:00
Gregory Roussac
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
gr4devel
f535d60a29 [-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController 2013-09-02 14:24:18 +02:00
gr4devel
36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier 2013-09-02 14:15:33 +02:00
gRoussac
477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 2013-09-02 12:03:01 +02:00
gr4devel
6177589cd3 [+] MO : add link to all manufacturer page and the feature to show All Suppliers 2013-09-02 11:57:16 +02:00
gRoussac
4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active 2013-09-02 11:33:53 +02:00
gRoussac
62303e58df [-] INSTALLER : Fix fatal error when upgrading 2013-09-02 11:24:46 +02:00
Gregory Roussac
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
gRoussac
397e42637a // norms 2013-09-02 10:49:50 +02:00
Gregory Roussac
6dc0edec3a Merge pull request #668 from lrosset/development 
[-] CORE : Add APCu support
 2013-09-02 01:46:25 -07:00
Gregory Roussac
d019500d81 Merge pull request #670 from gr4devel/patch-2 
[+] FO : add getManufacturer() to ManufacturerControllerCore
 2013-09-02 01:31:14 -07:00
Gregory Roussac
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
gRoussac
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
Gregory Roussac
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
PrestaEdit
4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
sagaradonis
9cd73b411d Update ajax-cart.js 
.size() replaced by .length as .size() is outdated
 2013-08-31 19:05:14 +05:30
gr4devel
805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Francois Gaillard
d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
Rémi Gaillard
f7fefe789d // typo fix 2013-08-30 11:21:00 +02:00
Rémi Gaillard
37e3b9e9e4 [-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229 2013-08-30 11:13:30 +02:00
gr4devel
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
gr4devel
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
LOIC ROSSET ltd
24146181c6 Add APCu support 2013-08-29 20:13:58 +01:00
Francois Gaillard
e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard
eec8aaa4f8 // php noti 2013-08-29 18:15:51 +02:00
Rémi Gaillard
08b8277a7a ///// 2013-08-29 17:21:27 +02:00
Rémi Gaillard
51083e17af // 2013-08-29 17:18:05 +02:00
Jerome Nadaud
40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +02:00
Francois Gaillard
4a8f6c3116 // Modules categories sort 2013-08-29 17:00:34 +02:00
Rémi Gaillard
ffdc7b51b7 // php 5.2 2013-08-29 16:41:15 +02:00
Rémi Gaillard
1196c5d736 // php 5.2 2013-08-29 16:39:45 +02:00
Rémi Gaillard
01cbffad9b //miss on last commit 2013-08-29 16:11:24 +02:00
Rémi Gaillard
c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
Rémi Gaillard
6d1c8c54af Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-29 10:49:53 +02:00