 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 |
|
|
Jerome Nadaud
|
0393e6bc6d
|
// Date Range Picker improvement
|
2013-10-17 15:28:47 +02:00 |
|
|
Kevin Granger
|
1097bb56f9
|
// calendar
|
2013-10-17 14:35:51 +02:00 |
|
|
Jerome Nadaud
|
185c518d3d
|
// Force cast on select filter
|
2013-10-17 14:06:48 +02:00 |
|
|
Kevin Granger
|
b391d833d3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 14:01:50 +02:00 |
|
|
Kevin Granger
|
9abb9a9b15
|
// removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group)
|
2013-10-17 14:01:26 +02:00 |
|
|
Kevin Granger
|
dc43c0f7d3
|
// fix delete categories
|
2013-10-17 13:50:14 +02:00 |
|
|
Jerome Nadaud
|
99f66e26d0
|
// Change datepicker class
|
2013-10-17 13:24:46 +02:00 |
|
|
Jerome Nadaud
|
983b4dd617
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 11:41:10 +02:00 |
|
|
Jerome Nadaud
|
cee6c2b2d6
|
// Add class to calendar.tpl
|
2013-10-17 11:40:58 +02:00 |
|
|
Kevin Granger
|
193d3921fa
|
// calendar date range picker compare
|
2013-10-17 11:40:02 +02:00 |
|
|
Jerome Nadaud
|
f9b115a2f8
|
// Date Range picker improvements
|
2013-10-17 11:39:02 +02:00 |
|
|
Vincent Augagneur
|
d1ee6e6357
|
//small fix
|
2013-10-17 11:27:30 +02:00 |
|
|
Kevin Granger
|
86ef9b5461
|
// calendar
|
2013-10-17 11:22:03 +02:00 |
|
|
Vincent Augagneur
|
2f34af4646
|
//remove debug
|
2013-10-17 09:26:47 +02:00 |
|
|
Kevin Granger
|
89d7b9ab96
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 09:24:59 +02:00 |
|
|
Kevin Granger
|
334d0a01bd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
|
2013-10-17 09:24:09 +02:00 |
|
|
Jerome Nadaud
|
a85b931765
|
// Adding compare options
|
2013-10-16 19:07:23 +02:00 |
|