 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 |
|
|
Vincent Augagneur
|
b882ecfbbc
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-02 11:44:01 +02:00 |
|
|
Vincent Augagneur
|
a6aed9632a
|
//dashboard data binding first part
|
2013-09-02 11:43:50 +02:00 |
|
|
Kevin Granger
|
735b20866b
|
// BO Bootstrap Search result page
|
2013-09-02 11:02:23 +02:00 |
|
|
Kevin Granger
|
0a8a4dcece
|
// BO Stats : Date Picker + Layout WIP
|
2013-09-02 10:47:07 +02:00 |
|
|
Vincent Augagneur
|
d0f2a37fff
|
//dashboard module view tpl init
|
2013-09-02 10:10:20 +02: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 |
|
|
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 |
|
|
Kevin Granger
|
7d4c0ad36e
|
// fix col-offset and btn-primary
|
2013-08-29 17:04:10 +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 |
|
|
Kevin Granger
|
c5ab91f171
|
[+] BO dashboard WIP
|
2013-08-29 14:52:14 +02:00 |
|
|
Rémi Gaillard
|
c736c28ab5
|
// small ajax.php clean
|
2013-08-29 11:47:11 +02:00 |
|
|
Kevin Granger
|
8660a24d55
|
[+] Dashboard Markup WIP
|
2013-08-28 19:26:19 +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 |
|
|
Jerome Nadaud
|
1fd6540574
|
[+] BO : Page header toolbar
|
2013-08-28 14:14:04 +02:00 |
|
|
Jerome Nadaud
|
c8d9b9bf3a
|
[+] BO : Page header toolbar
|
2013-08-28 14:07:50 +02:00 |
|
|
Jerome Nadaud
|
a76fc165db
|
[-] BO : Page header toolbar
|
2013-08-28 13:43:42 +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 |
|
|
Jerome Nadaud
|
9d991f3474
|
[+] BO : Page header toolbar
|
2013-08-28 11:16:36 +02:00 |
|
|
Jerome Nadaud
|
bfe6c07053
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-08-28 10:17:25 +02:00 |
|
|
Jerome Nadaud
|
e204cbf24e
|
[+] BO : Page header toolbar
|
2013-08-28 10:17:07 +02:00 |
|
|
Vincent Augagneur
|
0019426e81
|
//added dashboard controller
|
2013-08-28 10:04:28 +02:00 |
|
|
Vincent Augagneur
|
0a2d8175a7
|
//small fix
|
2013-08-28 10:03:50 +02:00 |
|
|
Jerome Nadaud
|
967fc98693
|
[+] BO : Page header toolbar
|
2013-08-28 09:37:49 +02:00 |
|
|
Jerome Nadaud
|
068da6f87c
|
[+] BO : Page header toolbar
|
2013-08-28 09:24:16 +02:00 |
|
|
Rémi Gaillard
|
6a4680b4f0
|
[-] WS: Bad xlink for tax_rules_group in product
|
2013-08-27 18:58:21 +02:00 |
|
|
Kevin Granger
|
9129ee79dc
|
// Modules position WIP
|
2013-08-27 18:54:57 +02:00 |
|
|
Jerome Nadaud
|
62b4a3cd5e
|
[+] BO : Page header toolbar
|
2013-08-27 18:42:24 +02:00 |
|
|
Jerome Nadaud
|
083eba3431
|
// Small title fix
|
2013-08-27 18:25:06 +02:00 |
|
|
Jerome Nadaud
|
4f022c48f8
|
[+] BO : Products page header toolbar
|
2013-08-27 18:23:38 +02:00 |
|
|
Jerome Nadaud
|
f60fe74336
|
[+] BO : Tracking page header toolbar
|
2013-08-27 18:22:54 +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 |
|
|
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 |
|
|
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 |
|