 gRoussac
|
54f7c65165
|
[-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_
|
2013-09-09 12:20:38 +02:00 |
|
|
gRoussac
|
6b03af9ef9
|
[-] BO : ini_get('safe_mode') can return false
|
2013-09-08 22:26:21 +02:00 |
|
|
gRoussac
|
ec556bb307
|
// remove Warning on array_map()
|
2013-09-08 20:01:55 +02:00 |
|
|
Francois Gaillard
|
768a8b36d5
|
[-] BO : AdminModulesController - Bug fix, $params was not set
|
2013-09-06 15:41:24 +02:00 |
|
|
Fabio Chelly
|
7e1c0d5a24
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-06 09:24:43 +02:00 |
|
|
Rémi Gaillard
|
0f81518ba2
|
// Add a buton to erase all log
|
2013-09-05 15:58:36 +02:00 |
|
|
gRoussac
|
6daf8ebbfa
|
[-] BO : Fix error returned when first import of a localisation pack
|
2013-09-03 18:20:58 +02:00 |
|
|
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
|
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 |
|
|
Francois Gaillard
|
d0087267df
|
// Fixed tips of the day & encoding
|
2013-08-30 14:22:24 +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 |
|