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
djfm and Rémi Gaillard
be83f1364d
// updated Czech localization pack
2013-08-29 10:49:39 +02:00
Rémi Gaillard
fb397d3163
Merge pull request #662 from djfm/localization
...
// updated Czech localization pack
2013-08-29 01:43:33 -07:00
Damien Metzger
f24391be5a
// Fixed hook::getidbyname case
2013-08-29 09:39:48 +02:00
Damien Metzger
5dee3ca245
// Fixed hook::getidbyname case
2013-08-29 09:33:28 +02:00
ha99y
75303e82e0
Suppress Error at rename
...
If debugging is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
2013-08-28 18:56:49 -07:00
Rémi Gaillard
ddc16a2f65
[-] BO: Fix fatal error on customer edition when email is not valid
2013-08-28 17:46:05 +02:00
Rémi Gaillard
c72fd867fe
// git checkout controllers/
2013-08-28 12:24:10 +02:00
Rémi Gaillard
63d9005a10
// liveedit
2013-08-28 12:21:01 +02:00
Vincent Augagneur
0a2d8175a7
//small fix
2013-08-28 10:03:50 +02:00
Damien Metzger
7a429cd3ea
// Version number
2013-08-28 10:00:29 +02:00
Damien Metzger
330aed3f7a
// Translations
2013-08-28 09:51:02 +02:00
Vincent Augagneur and Damien Metzger
efc44392b6
//small fix
2013-08-28 09:48:01 +02:00
ha99y
ffd712312d
Add new argument to function getImages
...
1st: The function will return the product attribute id's with the list.
2nd: If product attribute id is passed to the function it will return
only the image id of the given attribute.
2013-08-28 00:27:52 -07:00
Rémi Gaillard
6a4680b4f0
[-] WS: Bad xlink for tax_rules_group in product
2013-08-27 18:58:21 +02:00
Vincent Augagneur
5c367cd6e7
//small fix
2013-08-27 18:52:34 +02:00
Vincent Augagneur
41a5eb8411
//small fix
2013-08-27 18:50:14 +02:00
Vincent Augagneur
9b7f32cbac
[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
2013-08-27 18:13:44 +02:00
Vincent Augagneur
901c08cac8
[-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed
2013-08-27 18:13:22 +02:00
Vincent Augagneur
4bb0e16509
[-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed
2013-08-27 16:43:14 +02:00
Vincent Augagneur
39c882cdb4
//small fix
2013-08-27 16:21:13 +02:00
Rémi Gaillard
30a914b148
// typo
2013-08-27 15:41:00 +02:00
Rémi Gaillard
598469e41e
// typo debug
2013-08-27 15:38:29 +02:00
Gregory Roussac
dlage