Sarah Lorenzini
|
32a85007df
|
// update mail templates
|
2013-10-22 15:45:33 +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
|
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
|
b6d6336e26
|
// Add date subtitle
|
2013-10-22 12:12:41 +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 |
|
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 |
|
Jerome Nadaud
|
fb167d94f9
|
// Remove duplicate class
|
2013-10-21 19:13:19 +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 |
|
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
|
5f75439a6b
|
// Date range picker improvements
|
2013-10-21 17:07:57 +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 |
|
Kevin Granger
|
957f9f0467
|
// categories group
|
2013-10-21 12:21:35 +02:00 |
|
Jerome Nadaud
|
9c4b975cfc
|
//Module uploader bootstraping
|
2013-10-21 11:31:50 +02:00 |
|
Jerome Nadaud
|
81042db718
|
// CSV import uploader bootstraping
|
2013-10-21 11:24:56 +02:00 |
|
Kevin Granger
|
a5ca6f11a7
|
// css email
|
2013-10-21 09:51:46 +02:00 |
|
Vincent Augagneur
|
fd86a29c5c
|
//small fix
|
2013-10-21 09:50:20 +02:00 |
|
Kevin Granger
|
067eecdc70
|
// small fix
|
2013-10-18 19:07:03 +02:00 |
|
Kevin Granger
|
04b4e548f3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 18:38:17 +02:00 |
|
Kevin Granger
|
5f52a9e171
|
// fix products
|
2013-10-18 18:38:02 +02:00 |
|
Damien Metzger
|
d1a2c33322
|
Merge pull request #849 from djfm/bootstrap
// Translations fix
|
2013-10-18 09:35:20 -07:00 |
|
Jerome Nadaud
|
6c37efdb6a
|
// Categories image upload bootstraping
|
2013-10-18 18:33:32 +02:00 |
|
Jerome Nadaud
|
ff81667b5c
|
// Image thumnail fix
|
2013-10-18 18:28:57 +02:00 |
|
Jerome Nadaud
|
667353d43f
|
// Store contacts bootstraping
|
2013-10-18 18:24:21 +02:00 |
|
Jerome Nadaud
|
ac112c38df
|
// File imput improvement
|
2013-10-18 17:32:29 +02:00 |
|
Damien Metzger
|
9dfecbb1b8
|
// Fixed addons url
|
2013-10-18 17:05:04 +02:00 |
|
djfm
|
5a3d487e9f
|
// sprintf again
|
2013-10-18 14:31:48 +00:00 |
|
djfm
|
901f5aeb08
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 08:20:32 +00:00 |
|
djfm
|
37656c2df9
|
// fixed improper English string for translation
|
2013-10-18 08:20:20 +00:00 |
|
Kevin Granger
|
9c07cb9302
|
// fix informations
|
2013-10-17 18:43:15 +02:00 |
|
Kevin Granger
|
d933466d04
|
// fixs add product informations
|
2013-10-17 18:11:47 +02:00 |
|
Kevin Granger
|
7189aa9de9
|
// fix yes/no, alert success, cache clear button
|
2013-10-17 17:33:55 +02:00 |
|
Kevin Granger
|
c43a7093ac
|
// fix calendar
|
2013-10-17 15:57:23 +02:00 |
|
Jerome Nadaud
|
205e00d4a7
|
// small fix
|
2013-10-17 15:43:52 +02:00 |
|
Kevin Granger
|
7ae123227e
|
// fix nav collapsed and clipping on page loading
|
2013-10-17 15:39:53 +02:00 |
|