 gRoussac
|
98f60d039b
|
// fix warning
|
2013-09-03 12:29:17 +02: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 |
|
|
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 |
|
|
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 |
|
|
Gregory Roussac
|
d019500d81
|
Merge pull request #670 from gr4devel/patch-2
[+] FO : add getManufacturer() to ManufacturerControllerCore
|
2013-09-02 01:31:14 -07:00 |
|
|
PrestaEdit
|
4c633b8b46
|
[*] BO: sort modules name in Stats
|
2013-09-01 16:55:22 +02:00 |
|
|
gr4devel
|
805e80e54c
|
[+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController
|
2013-08-30 21:24:21 +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 |
|
|
Francois Gaillard
|
e6abe1c5a0
|
// Release branch merged
|
2013-08-29 18:46:34 +02:00 |
|
|
Rémi Gaillard
|
51083e17af
|
//
|
2013-08-29 17:18:05 +02:00 |
|
|
Francois Gaillard
|
4a8f6c3116
|
// Modules categories sort
|
2013-08-29 17:00:34 +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
|
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 |
|
|
Rémi Gaillard
|
6a4680b4f0
|
[-] WS: Bad xlink for tax_rules_group in product
|
2013-08-27 18:58:21 +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 |
|
|
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 |
|
|
Jerome Nadaud
|
de200e1c5e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-27 09:50:35 +02:00 |
|
|
Rémi Gaillard
|
6fd7f0114e
|
// small fix
|
2013-08-27 09:52:05 +02:00 |
|
|
Rémi Gaillard
|
1a5b9de372
|
// small fix
|
2013-08-27 09:51:56 +02:00 |
|
|
Jerome Nadaud
|
5a685537a4
|
// Small Fix
|
2013-08-27 09:49:59 +02:00 |
|
|
Rémi Gaillard
|
2435edc98c
|
// small fix
|
2013-08-26 17:17:26 +02:00 |
|
|
Rémi Gaillard
|
1b26cfffd9
|
// small fix
|
2013-08-26 17:13:29 +02:00 |
|
|
Vincent Augagneur
|
ad428dfb2b
|
//MERGE branche release
|
2013-08-26 10:59:36 +02:00 |
|
|
Jerome Nadaud
|
9f2423c2c5
|
[-] BO : FixBug Url rewrite preview when user have a different language from shop
|
2013-08-26 08:52:22 +02:00 |
|
|
Vincent Augagneur
|
8412192822
|
[-] BO : fixed bug with multistore context on carrier wizard
|
2013-08-23 10:34:30 +02:00 |
|
|
Vincent Augagneur
|
d48df48a03
|
//small fux on live edit URL
|
2013-08-23 09:44:47 +02:00 |
|
|
Rémi Gaillard
|
8ff8ea416d
|
// fix weird bug
|
2013-08-22 17:37:46 +02:00 |
|
|
Jerome Nadaud
|
94133bf734
|
[-] FO : FixBug duplicate fields for delivery address in OPC mode
|
2013-08-22 16:45:52 +02:00 |
|
|
djfm
|
47827a1a1b
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-22 12:31:28 +00:00 |
|
|
Rémi Gaillard
|
f476b34139
|
[-] BO: Fix multishop association for tax rules group - #PSCFV-9967
|
2013-08-22 11:13:11 +02:00 |
|
|
Rémi Gaillard
|
9d261b8f1f
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-22 10:54:07 +02:00 |
|
|
Rémi Gaillard
|
907d81c32e
|
// duplication of tax_rules_group on adminproducts with multishop
|
2013-08-22 10:53:50 +02:00 |
|
|
Vincent Augagneur
|
ba95c9a63a
|
[-] BO : fixed bug #PSCFV-10073 - now you can upload carrier logo on windows
|
2013-08-22 10:09:49 +02:00 |
|
|
Rémi Gaillard
|
dd9aa9fdb5
|
// disable log deletion
|
2013-08-21 17:43:34 +02:00 |
|
|
djfm
|
5faaef9f21
|
// fixed a few untranslatable strings in CarrierWizard
|
2013-08-21 14:33:22 +00:00 |
|
|
Rémi Gaillard
|
600b027efd
|
// fix root categories addition
|
2013-08-21 14:37:39 +02:00 |
|
|
Damien Metzger
|
65c6d86e6e
|
// Fixed simple multistore process
|
2013-08-21 10:23:53 +02:00 |
|
|
Damien Metzger
|
3287e1664c
|
// Added target blank in a transverse link
|
2013-08-21 10:18:46 +02:00 |
|
|
Damien Metzger
|
65becc8550
|
// Fixed typo
|
2013-08-21 10:10:52 +02:00 |
|
|
Jerome Nadaud
|
57d8d9c232
|
[-] BO : FixBug Preview product url
|
2013-08-20 15:34:00 +02:00 |
|
|
Damien Metzger
|
496db1d13e
|
// Added automatic smarty cache clearing after catalog import (csv)
|
2013-08-20 10:45:55 +02:00 |
|
|
Vincent Augagneur
|
8a0745e8de
|
[-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore
|
2013-08-19 17:21:03 +02:00 |
|