Jerome Nadaud
|
39edb5a546
|
// Fix cart rules bootstrap design
|
2013-09-19 19:33:55 +02:00 |
|
Jerome Nadaud
|
9b308ae7fc
|
// Fix Translatable field on cart rule information
|
2013-09-19 19:01:43 +02:00 |
|
Jerome Nadaud
|
e1a3440145
|
// Add array for hint and desc for options.tpl
|
2013-09-19 18:56:35 +02:00 |
|
Jerome Nadaud
|
b40b9ec328
|
// Fix Permissions
|
2013-09-19 18:26:42 +02:00 |
|
Jerome Nadaud
|
f8fed30b44
|
// Prevent enter key event propagation for search input
|
2013-09-19 18:07:50 +02:00 |
|
Jerome Nadaud
|
2e80f00ba2
|
// Remove console log
|
2013-09-19 17:39:11 +02:00 |
|
Jerome Nadaud
|
48d7e43f1c
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 17:38:19 +02:00 |
|
Jerome Nadaud
|
6f483a87a9
|
// Fix hide language on ajax load
|
2013-09-19 17:38:07 +02:00 |
|
Sarah Lorenzini
|
550f6c190b
|
// update stats tabs
|
2013-09-19 17:36:27 +02:00 |
|
gRoussac
|
e0b59082f9
|
[-] BO : Issue with domready on adminImport
|
2013-09-19 17:19:51 +02:00 |
|
Kevin Granger
|
650001024a
|
// orders cleanup
|
2013-09-19 16:55:06 +02:00 |
|
gRoussac
|
ea6ea955bb
|
// licence
|
2013-09-19 16:39:21 +02:00 |
|
gRoussac
|
0c511dead5
|
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
|
2013-09-19 16:28:19 +02:00 |
|
Jerome Nadaud
|
33943ef66a
|
// Date range filter
|
2013-09-19 16:23:26 +02:00 |
|
Jerome Nadaud
|
3b465111b9
|
// Customer group
|
2013-09-19 15:57:28 +02:00 |
|
Jerome Nadaud
|
15622fbf45
|
// Customers group
|
2013-09-19 14:25:17 +02:00 |
|
Kevin Granger
|
d735496159
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 12:09:34 +02:00 |
|
Kevin Granger
|
be8f728b2a
|
// orders
|
2013-09-19 12:09:25 +02:00 |
|
Jerome Nadaud
|
eb1531a0b3
|
// Fix textlang size and textarea input group
|
2013-09-19 11:23:09 +02:00 |
|
djfm
|
0a9f425281
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 16:08:44 +00:00 |
|
Jerome Nadaud
|
38d565110f
|
// List header fix
|
2013-09-18 17:23:22 +02:00 |
|
Kevin Granger
|
ac1b9fd96e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-18 17:10:59 +02:00 |
|
Kevin Granger
|
806e628997
|
// dashboard update version
|
2013-09-18 17:10:48 +02:00 |
|
Jerome Nadaud
|
1f3e717eb6
|
// Preferences - Admin bootstrap fix
|
2013-09-18 16:22:05 +02:00 |
|
Jerome Nadaud
|
0683ed4092
|
// Some list design fix
|
2013-09-18 15:25:58 +02:00 |
|
gRoussac
|
f293562ea4
|
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
|
2013-09-18 15:03:16 +02:00 |
|
Kevin Granger
|
b71b594ca1
|
// fix tree search / title / manufacturers
|
2013-09-18 15:00:10 +02:00 |
|
Jerome Nadaud
|
c48f4f5e1b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-18 10:44:19 +02:00 |
|
Jerome Nadaud
|
5a206e83a8
|
// Security
|
2013-09-18 10:43:58 +02:00 |
|
Damien Metzger
|
50a9e7ef99
|
// Code cleaning
|
2013-09-18 10:29:19 +02:00 |
|
Jerome Nadaud
|
897f1eafeb
|
//Suppliers view
|
2013-09-18 10:29:04 +02:00 |
|
Jerome Nadaud
|
8081acb0b5
|
// Supliers view
|
2013-09-18 10:09:45 +02:00 |
|
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 |
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
Damien Metzger
|
f7855f2a3a
|
// Always more KPIs
|
2013-09-17 12:47:13 +02:00 |
|
Jérôme Nadaud
|
47341ce0bb
|
// Attributes generator
|
2013-09-17 12:33:06 +02:00 |
|
Vincent Augagneur
|
3151064daf
|
//small fix on helper form && option
|
2013-09-17 12:18:37 +02:00 |
|
Kevin Granger
|
5c04e5564c
|
// tags + fixed-width
|
2013-09-17 11:59:57 +02:00 |
|
Damien Metzger
|
c0c4af988f
|
// Added net profits / visitor as a KPI
|
2013-09-17 10:47:54 +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 |
|
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 |
|