 Kevin Granger
|
87eb9bba26
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-31 19:13:53 +01:00 |
|
|
Kevin Granger
|
64598535bd
|
// Avatar + Vertical Nav WIP
|
2013-10-31 19:13:34 +01:00 |
|
|
Rémi Gaillard
|
74e92e364c
|
// php warning
|
2013-10-31 18:26:09 +01:00 |
|
|
Kevin Granger
|
ba28c5f527
|
// UI fixs
|
2013-10-31 15:49:57 +01:00 |
|
|
Kevin Granger
|
534421fb6b
|
// UI fixs
|
2013-10-31 12:20:29 +01:00 |
|
|
Kevin Granger
|
4334364b36
|
// cart rules > conditions > product rules
|
2013-10-31 11:34:47 +01:00 |
|
|
Rémi Gaillard
|
d17515a728
|
// don't format currency on input
|
2013-10-31 10:22:38 +01:00 |
|
|
Kevin Granger
|
09dcff959e
|
// cart rules > conditions > product rules WIP
|
2013-10-30 19:25:58 +01:00 |
|
|
gRoussac
|
8547f663d1
|
[-] BO : AdminImport withdraw separator changed in js
|
2013-10-30 18:46:02 +01:00 |
|
|
Rémi Gaillard
|
ecf45d0475
|
// small fix
|
2013-10-30 18:28:55 +01:00 |
|
|
Jerome Nadaud
|
9f2424db41
|
// Fix Module exception in transplant
|
2013-10-30 18:11:33 +01:00 |
|
|
Rémi Gaillard
|
8aa369531e
|
// employee avatar
|
2013-10-30 18:02:10 +01:00 |
|
|
Madef
|
78af47e2d3
|
[-] BO : tagify call twice if field is not translatable
|
2013-10-29 23:18:34 +01:00 |
|
|
Kevin Granger
|
df80e6ec8b
|
// btn-group-action adjustments
|
2013-10-29 18:55:33 +01:00 |
|
|
Kevin Granger
|
0b564c0107
|
// oups
|
2013-10-29 18:15:17 +01:00 |
|
|
Kevin Granger
|
aee725839e
|
// fixs btn-group
|
2013-10-29 18:10:07 +01:00 |
|
|
Rémi Gaillard
|
6d5ca9969e
|
// js error
|
2013-10-29 17:56:29 +01:00 |
|
|
Kevin Granger
|
5fa36abcaf
|
// fixs UI
|
2013-10-29 17:32:57 +01:00 |
|
|
gRoussac
|
75cde08776
|
// update conf message in AdminImport
|
2013-10-29 16:16:55 +01:00 |
|
|
Jerome Nadaud
|
b605f33359
|
[-] BO : FixBug #PSCFV-10866 - Tagify system not working
|
2013-10-29 12:07:30 +01:00 |
|
|
Jerome Nadaud
|
580e201c48
|
[-] BO : FixBug #PSCFV-9319 - display only valid order id
|
2013-10-29 11:38:48 +01:00 |
|
|
Damien Metzger
|
dabb23ac8d
|
// Added KPIs to the category page and fixed dashboard data
|
2013-10-29 11:03:09 +01:00 |
|
|
Rémi Gaillard
|
07222be5dd
|
// demo mode on ajaxfilemanager
|
2013-10-29 10:53:00 +01:00 |
|
|
Kevin Granger
|
b3d7b8754b
|
// fixs date range picker Wip
|
2013-10-29 10:40:33 +01:00 |
|
|
Rémi Gaillard
|
2b67d7072c
|
// type of logger field
|
2013-10-29 10:18:29 +01:00 |
|
|
gRoussac
|
0aca1d4a67
|
[*] BO : AdminProducts find smallest images
|
2013-10-29 08:47:41 +01:00 |
|
|
Jerome Nadaud
|
dd10301413
|
// Fix tagify key events
|
2013-10-28 17:46:00 +01:00 |
|
|
Jerome Nadaud
|
a466c6f5f7
|
// Add tagify system to product information
|
2013-10-28 16:32:17 +01:00 |
|
|
Kevin Granger
|
3798adff2f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-28 16:19:02 +01:00 |
|
|
Kevin Granger
|
d523d739e7
|
// dashboard date range picker wip
|
2013-10-28 16:18:43 +01:00 |
|
|
Rémi Gaillard
|
1454a0d26a
|
// search type in BO
|
2013-10-28 15:32:26 +01:00 |
|
|
Damien Metzger
|
08732eda50
|
// Fixed default selection in the stats submenu
|
2013-10-28 12:08:46 +01:00 |
|
|
gRoussac
|
4103339f53
|
[-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502
|
2013-10-28 11:21:25 +01:00 |
|
|
Kevin Granger
|
7126397bfe
|
// fix scroll vertical nav
|
2013-10-28 10:13:35 +01:00 |
|
|
Kevin Granger
|
8353bc5ac2
|
// fix attributes-color-container
|
2013-10-28 09:32:46 +01:00 |
|
|
gRoussac
|
2dbaa5f73b
|
[-] BO : Fix bug #10689, could not set image legend in back office
|
2013-10-27 22:49:25 +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 |
|
|
Rémi Gaillard
|
c67e71ca59
|
// layout fix
|
2013-10-25 17:30:10 +02:00 |
|
|
Kevin Granger
|
50bc046671
|
// fix panel header tree actions (search + button)
|
2013-10-25 17:24:49 +02:00 |
|
|
Rémi Gaillard
|
180b180aee
|
// small changes
|
2013-10-25 16:24:57 +02:00 |
|
|
Jerome Nadaud
|
f472f3e848
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-25 15:55:39 +02:00 |
|
|
Jerome Nadaud
|
f89c8ed008
|
// Fix HelperUploader images params
|
2013-10-25 15:54:53 +02:00 |
|
|
Damien Metzger
|
aa322e4777
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-10-25 15:22:01 +02:00 |
|
|
Damien Metzger
|
e8d5dc8a62
|
[*] BO : search results improvements (no unaccessible tabs, better display, better information)
|
2013-10-25 15:19:03 +02:00 |
|
|
Kevin Granger
|
339f428c23
|
// fix login - (tabindex, loading, ellipsis)
|
2013-10-25 14:58:10 +02:00 |
|
|
Jerome Nadaud
|
08baa71a05
|
// Fix on color field in list
|
2013-10-25 14:29:30 +02:00 |
|