Kevin Granger
|
5fa36abcaf
|
// fixs UI
|
2013-10-29 17:32:57 +01:00 |
|
Jerome Nadaud
|
b605f33359
|
[-] BO : FixBug #PSCFV-10866 - Tagify system not working
|
2013-10-29 12:07:30 +01:00 |
|
Damien Metzger
|
dabb23ac8d
|
// Added KPIs to the category page and fixed dashboard data
|
2013-10-29 11:03:09 +01:00 |
|
Jerome Nadaud
|
dd10301413
|
// Fix tagify key events
|
2013-10-28 17:46:00 +01:00 |
|
Kevin Granger
|
d523d739e7
|
// dashboard date range picker wip
|
2013-10-28 16:18:43 +01:00 |
|
Damien Metzger
|
6f04df8409
|
// Fixed icon
|
2013-10-25 19:06:03 +02:00 |
|
Damien Metzger
|
39f6a2354a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
classes/helper/HelperForm.php
classes/helper/HelperUploader.php
|
2013-10-25 18:58:07 +02:00 |
|
Damien Metzger
|
03857c0576
|
[*] BO : you can know download the previous file near the upload file input
|
2013-10-25 18:55:25 +02:00 |
|
Jerome Nadaud
|
8be88324f9
|
// Add internet explorer 9 Compat
|
2013-10-25 18:13:25 +02:00 |
|
Jerome Nadaud
|
5ea880b793
|
// XHTML norm
|
2013-10-25 17:37:08 +02:00 |
|
Kevin Granger
|
50bc046671
|
// fix panel header tree actions (search + button)
|
2013-10-25 17:24:49 +02:00 |
|
Jerome Nadaud
|
f89c8ed008
|
// Fix HelperUploader images params
|
2013-10-25 15:54:53 +02:00 |
|
Jerome Nadaud
|
08baa71a05
|
// Fix on color field in list
|
2013-10-25 14:29:30 +02:00 |
|
Jerome Nadaud
|
8d1765f2df
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
controllers/admin/AdminCategoriesController.php
|
2013-10-25 14:29:02 +02:00 |
|
Jerome Nadaud
|
52795495bd
|
//Starting Uploader helper
|
2013-10-25 14:19:51 +02:00 |
|
Damien Metzger
|
087d0d8206
|
// Fields resizing
|
2013-10-25 11:25:13 +02:00 |
|
Damien Metzger
|
0ca5a24e84
|
// Added field (bootstrap) size in helper form
|
2013-10-25 10:16:39 +02:00 |
|
Jerome Nadaud
|
6f57093f50
|
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
|
2013-10-24 18:36:36 +02:00 |
|
Jerome Nadaud
|
0bf6410773
|
//Fix save and stay combinations problem
|
2013-10-23 12:10:36 +02:00 |
|
Jerome Nadaud
|
45ea4aefad
|
// Fix Combinations ajax problem
|
2013-10-23 10:50:18 +02:00 |
|
Jerome Nadaud
|
766d0e01f4
|
// Adding reset button to form template
|
2013-10-22 18:00:39 +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 |
|
Jerome Nadaud
|
73e9d966a6
|
// list bulk actions fix
|
2013-10-22 11:24:50 +02:00 |
|
Jerome Nadaud
|
fb167d94f9
|
// Remove duplicate class
|
2013-10-21 19:13:19 +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 |
|
Jerome Nadaud
|
d6ad300625
|
// List pagination improvements
|
2013-10-21 17:59:48 +02:00 |
|
Jerome Nadaud
|
5f75439a6b
|
// Date range picker improvements
|
2013-10-21 17:07:57 +02:00 |
|
Jerome Nadaud
|
e53e63c257
|
// Add Back button to list footer
|
2013-10-21 13:45:39 +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 |
|
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 |
|
Jerome Nadaud
|
ac112c38df
|
// File imput improvement
|
2013-10-18 17:32:29 +02:00 |
|
Kevin Granger
|
7189aa9de9
|
// fix yes/no, alert success, cache clear button
|
2013-10-17 17:33:55 +02:00 |
|
Jerome Nadaud
|
205e00d4a7
|
// small fix
|
2013-10-17 15:43:52 +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 |
|
Jerome Nadaud
|
99f66e26d0
|
// Change datepicker class
|
2013-10-17 13:24:46 +02:00 |
|
Jerome Nadaud
|
cee6c2b2d6
|
// Add class to calendar.tpl
|
2013-10-17 11:40:58 +02:00 |
|
Jerome Nadaud
|
f9b115a2f8
|
// Date Range picker improvements
|
2013-10-17 11:39:02 +02:00 |
|
Kevin Granger
|
86ef9b5461
|
// calendar
|
2013-10-17 11:22:03 +02:00 |
|
gRoussac
|
f1ea9ba5b4
|
[-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it
|
2013-10-17 10:53:20 +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 |
|
Kevin Granger
|
561c036240
|
// calendar
|
2013-10-16 19:03:02 +02:00 |
|