 Damien Metzger
|
3539a779f8
|
// Oops
|
2013-10-22 17:32:02 +02:00 |
|
|
Damien Metzger
|
4e8ba711d9
|
// Oops
|
2013-10-22 17:15:08 +02:00 |
|
|
Sarah Lorenzini
|
cc1dd2510a
|
// mail template src
|
2013-10-22 16:24:16 +02:00 |
|
|
Jerome Nadaud
|
c458e059d5
|
// Fix hook list problem on multishop
|
2013-10-22 16:18:50 +02:00 |
|
|
Sarah Lorenzini
|
32a85007df
|
// update mail templates
|
2013-10-22 15:45:33 +02:00 |
|
|
Damien Metzger
|
04f0545254
|
// forgot to rename a field
|
2013-10-22 15:37:33 +02:00 |
|
|
Damien Metzger
|
1323befe2f
|
// Add link to profitability conf
|
2013-10-22 15:36:46 +02:00 |
|
|
Damien Metzger
|
8ef9e71966
|
// Refine dashboard net profits
|
2013-10-22 15:16:22 +02:00 |
|
|
Vincent Augagneur
|
fea7cd5983
|
//helper list must be wrapped by a form even if it's a simple header
|
2013-10-22 14:48:44 +02:00 |
|
|
Damien Metzger
|
b4499937d8
|
// Comparison is optionnal
|
2013-10-22 14:15:10 +02:00 |
|
|
Damien Metzger
|
a4eeff4cd7
|
// Shortcuts for chart selection
|
2013-10-22 14:07:19 +02:00 |
|
|
Jerome Nadaud
|
a7c7bc68a3
|
// Fix products form content
|
2013-10-22 13:38:47 +02:00 |
|
|
Jerome Nadaud
|
c307eb7ece
|
// Date range picker fix
|
2013-10-22 12:29:17 +02:00 |
|
|
Jerome Nadaud
|
a8db1f3030
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-22 12:13:37 +02:00 |
|
|
Jerome Nadaud
|
b6d6336e26
|
// Add date subtitle
|
2013-10-22 12:12:41 +02:00 |
|
|
Damien Metzger
|
857c66454b
|
// Typo
|
2013-10-22 11:47:47 +02:00 |
|
|
Damien Metzger
|
16cf10d586
|
// New profitability calculation
|
2013-10-22 11:39:57 +02:00 |
|
|
Jerome Nadaud
|
d8d9436f51
|
// add date change trigger
|
2013-10-22 11:35:24 +02:00 |
|
|
Jerome Nadaud
|
73e9d966a6
|
// list bulk actions fix
|
2013-10-22 11:24:50 +02:00 |
|
|
Rémi Gaillard
|
c6997bd525
|
// move clear cache of color list
|
2013-10-22 11:09:55 +02:00 |
|
|
Jerome Nadaud
|
96766a311e
|
// Unify form fields for image preferences
|
2013-10-22 10:10:15 +02:00 |
|
|
Kevin Granger
|
aa95454c4e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/images/content.tpl
|
2013-10-22 10:07:03 +02:00 |
|
|
Kevin Granger
|
eb82297f45
|
// small fixs
|
2013-10-22 10:04:45 +02:00 |
|
|
Jerome Nadaud
|
3ba337f19a
|
// Image preference bootstraping
|
2013-10-22 09:25:05 +02:00 |
|
|
Vincent Augagneur
|
a62f9169d5
|
//missing file btn-primary => btn btn-default
|
2013-10-22 09:15:46 +02:00 |
|
|
Vincent Augagneur
|
8144935d76
|
//btn-primary => btn btn-default thanks @Shipow
|
2013-10-22 09:12:01 +02:00 |
|
|
Vincent Augagneur
|
6bc9b54306
|
//small fix - added new link on block top menu
|
2013-10-21 22:29:56 +02:00 |
|
|
Jerome Nadaud
|
fb167d94f9
|
// Remove duplicate class
|
2013-10-21 19:13:19 +02:00 |
|
|
Damien Metzger
|
e8f68441db
|
// Assigned shop phone to frontend smarty
|
2013-10-21 19:02:25 +02:00 |
|
|
Kevin Granger
|
fadbc4c250
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 19:00:18 +02:00 |
|
|
Kevin Granger
|
c89f6c1adb
|
// css fix
|
2013-10-21 18:58:23 +02:00 |
|
|
Jerome Nadaud
|
f336cc599b
|
// Btn-primary replacement
|
2013-10-21 18:56:41 +02:00 |
|
|
Jerome Nadaud
|
766e409476
|
// Wrong end block position
|
2013-10-21 18:34:03 +02:00 |
|
|
Damien Metzger
|
bf6c57063c
|
// Fixed dashboard style
|
2013-10-21 18:18:48 +02:00 |
|
|
Damien Metzger
|
58aa64fab7
|
// Code cleaning
|
2013-10-21 18:18:48 +02:00 |
|
|
Kevin Granger
|
3ae1f68b3b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 18:03:15 +02:00 |
|
|
Kevin Granger
|
2e13013657
|
// search field WIP
|
2013-10-21 18:03:00 +02:00 |
|
|
Jerome Nadaud
|
d6ad300625
|
// List pagination improvements
|
2013-10-21 17:59:48 +02:00 |
|
|
Damien Metzger
|
e7b901ce34
|
// Smaller update notification
|
2013-10-21 17:24:34 +02:00 |
|
|
Jerome Nadaud
|
f0104dc726
|
// Wait 1s for ajax element close
|
2013-10-21 17:22:42 +02:00 |
|
|
Jerome Nadaud
|
5f75439a6b
|
// Date range picker improvements
|
2013-10-21 17:07:57 +02:00 |
|
|
gRoussac
|
aefa821d7f
|
[*] MO : TM - Blockcart added Layer
|
2013-10-21 16:55:47 +02:00 |
|
|
Damien Metzger
|
3cf5c9968b
|
// Added images to blockmanufacturers
|
2013-10-21 15:39:14 +02:00 |
|
|
Vincent Augagneur
|
10473e09ad
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 14:51:25 +02:00 |
|
|
Vincent Augagneur
|
150c6e0130
|
[+] CORE : helperList action can be rendered from module classe
|
2013-10-21 14:51:14 +02:00 |
|
|
Jerome Nadaud
|
7fbf6c7de0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 13:45:50 +02:00 |
|
|
Jerome Nadaud
|
e53e63c257
|
// Add Back button to list footer
|
2013-10-21 13:45:39 +02:00 |
|
|
gRoussac
|
7c7fe5dc0b
|
// small change
|
2013-10-21 12:39:48 +02:00 |
|
|
Jerome Nadaud
|
53a7b75d7a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 12:36:02 +02:00 |
|
|
Jerome Nadaud
|
101df4c0b9
|
// Add check list filters value
|
2013-10-21 12:35:57 +02:00 |
|