 Jerome Nadaud
|
8f10a0e32f
|
// Product customization
|
2013-09-17 17:30:23 +02:00 |
|
|
Kevin Granger
|
51663f972e
|
// fix scenes
|
2013-09-17 17:15:40 +02:00 |
|
|
Jerome Nadaud
|
0971750f9f
|
// Attribute generator to bootstrap
|
2013-09-17 16:36:54 +02:00 |
|
|
Damien Metzger
|
f7855f2a3a
|
// Always more KPIs
|
2013-09-17 12:47:13 +02:00 |
|
|
Jérôme Nadaud
|
a0be556795
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-17 12:33:48 +02:00 |
|
|
Jérôme Nadaud
|
47341ce0bb
|
// Attributes generator
|
2013-09-17 12:33:06 +02:00 |
|
|
Kevin Granger
|
a53080eefc
|
// fix bug css
|
2013-09-17 12:32:36 +02:00 |
|
|
Kevin Granger
|
5c04e5564c
|
// tags + fixed-width
|
2013-09-17 11:59:57 +02:00 |
|
|
Jérôme Nadaud
|
0ab792cc6e
|
// Change tagify class
|
2013-09-17 10:52:21 +02:00 |
|
|
Damien Metzger
|
c0c4af988f
|
// Added net profits / visitor as a KPI
|
2013-09-17 10:47:54 +02:00 |
|
|
Damien Metzger
|
70f284ad88
|
[+] BO : new graph engine nvd3 (still need some development - will replace the other engines)
|
2013-09-17 10:24:46 +02:00 |
|
|
Jérôme Nadaud
|
455904a59b
|
// Some input fix
|
2013-09-17 10:13:00 +02:00 |
|
|
Kevin Granger
|
e08d2a8361
|
// fix
|
2013-09-17 10:00:33 +02:00 |
|
|
Jérôme Nadaud
|
ab5dd91359
|
// Localization
|
2013-09-17 09:18:56 +02:00 |
|
|
Jerome Nadaud
|
57ed337030
|
// Fix autosize for products attachment tab textarea
|
2013-09-16 18:57:11 +02:00 |
|
|
Damien Metzger
|
8934f9c7ed
|
[*] BO : Connected the first KPIs to real data
|
2013-09-16 18:40:34 +02:00 |
|
|
Jerome Nadaud
|
80b6d5a570
|
// fix autosize for textarea in options.tpl
|
2013-09-16 18:28:57 +02:00 |
|
|
Jerome Nadaud
|
a4103265e5
|
// Color picker
|
2013-09-16 18:17:29 +02:00 |
|
|
Sarah Lorenzini
|
4ef7bd0b77
|
// update stats tab
|
2013-09-16 17:51:03 +02:00 |
|
|
Jerome Nadaud
|
7b06758e22
|
// Fix carrier header and button link
|
2013-09-16 17:23:01 +02:00 |
|
|
Vincent Augagneur
|
c7a777163c
|
//small fix
|
2013-09-16 17:14:08 +02:00 |
|
|
Jerome Nadaud
|
fce87cf66a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-16 17:05:39 +02:00 |
|
|
Jerome Nadaud
|
235af94a92
|
// Fix Page header toolbar
|
2013-09-16 17:05:27 +02:00 |
|
|
Vincent Augagneur
|
b0ace74155
|
//small fix
|
2013-09-16 16:30:13 +02:00 |
|
|
Jerome Nadaud
|
7643a45d81
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-16 16:12:37 +02:00 |
|
|
Jerome Nadaud
|
29dad488d4
|
// Stats list active class
|
2013-09-16 16:12:23 +02:00 |
|
|
Sarah Lorenzini
|
9dfb573422
|
// update stats tab
|
2013-09-16 15:46:21 +02:00 |
|
|
Jerome Nadaud
|
517e95387c
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-16 15:33:04 +02:00 |
|
|
Jerome Nadaud
|
3107a4c3f0
|
// Translations
|
2013-09-16 15:32:49 +02:00 |
|
|
Kevin Granger
|
7f6255156e
|
// BO orders
|
2013-09-16 15:20:30 +02:00 |
|
|
Kevin Granger
|
f9334b029b
|
// add .row-margin-bottom
|
2013-09-16 15:05:19 +02:00 |
|
|
Jerome Nadaud
|
8f7cb72231
|
// Fix tabstop on language dropdown button
|
2013-09-16 14:35:28 +02:00 |
|
|
Jerome Nadaud
|
7e8d119213
|
// Textarea autosize
|
2013-09-16 14:25:49 +02:00 |
|
|
Kevin Granger
|
7c01df9268
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-16 11:45:13 +02:00 |
|
|
Kevin Granger
|
70b39019bf
|
// kpi orders
|
2013-09-16 11:45:02 +02:00 |
|
|
Vincent Augagneur
|
636c4575f7
|
//added warning domaine on dashboard && prestashop news improve
|
2013-09-16 10:59:42 +02:00 |
|
|
Kevin Granger
|
2af6c30bde
|
// fix nav
|
2013-09-16 09:50:34 +02:00 |
|
|
Damien Metzger
|
533003faa0
|
[-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error
|
2013-09-16 09:37:58 +02:00 |
|
|
Kevin Granger
|
81a783679d
|
// fix nav
|
2013-09-13 18:35:27 +02:00 |
|
|
Kevin Granger
|
bcfd092a1d
|
// fix nav
|
2013-09-13 17:48:46 +02:00 |
|
|
Jerome Nadaud
|
be0592d5a2
|
// Some fix
|
2013-09-13 17:19:20 +02:00 |
|
|
Jerome Nadaud
|
74237ff694
|
// Some fix
|
2013-09-13 17:11:12 +02:00 |
|
|
Jerome Nadaud
|
5e2aa392da
|
// Some fix
|
2013-09-13 15:40:51 +02:00 |
|
|
Jerome Nadaud
|
7b532d77fd
|
// Fix some bootstrap design
|
2013-09-13 15:36:27 +02:00 |
|
|
Kevin Granger
|
b58dddf521
|
// moved search/reset of list header
|
2013-09-13 15:03:26 +02:00 |
|
|
Kevin Granger
|
4f3183283f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-13 12:18:43 +02:00 |
|
|
Kevin Granger
|
4cde899834
|
// localization
|
2013-09-13 12:18:27 +02:00 |
|
|
Jerome Nadaud
|
0ba9704c21
|
// Fix class index error
|
2013-09-13 12:17:24 +02:00 |
|
|
Jerome Nadaud
|
2bf17241bd
|
// Fix associated categories tree header
|
2013-09-13 11:50:27 +02:00 |
|
|
Kevin Granger
|
968f2a45d5
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-13 11:41:26 +02:00 |
|