 Damien Metzger
|
ff2954b1d2
|
[*] FO : Changed category block behavior inside categories
|
2013-10-31 12:20:59 +01:00 |
|
|
Kevin Granger
|
534421fb6b
|
// UI fixs
|
2013-10-31 12:20:29 +01:00 |
|
|
Kevin Granger
|
03564fe0e5
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-31 11:34:58 +01:00 |
|
|
Kevin Granger
|
4334364b36
|
// cart rules > conditions > product rules
|
2013-10-31 11:34:47 +01:00 |
|
|
Rémi Gaillard
|
8a7f869515
|
// small graphical bug
|
2013-10-31 10:41:15 +01:00 |
|
|
Kevin Granger
|
09dcff959e
|
// cart rules > conditions > product rules WIP
|
2013-10-30 19:25:58 +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 |
|
|
Vincent Augagneur
|
6a3e711cff
|
//small fix
|
2013-10-30 15:43:31 +01:00 |
|
|
Rémi Gaillard
|
b9ad576fb0
|
// -> mailsrc branch
|
2013-10-30 15:02:06 +01:00 |
|
|
Vincent Augagneur
|
ad68105467
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-30 10:52:04 +01:00 |
|
|
Vincent Augagneur
|
0020412aea
|
//added Preactivation request on dashboard
|
2013-10-30 10:51:58 +01:00 |
|
|
Rémi Gaillard
|
190c14ed9d
|
// delete src mails -> go mailsrc branch
|
2013-10-30 10:25:51 +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 |
|
|
Kevin Granger
|
5fa36abcaf
|
// fixs UI
|
2013-10-29 17:32:57 +01:00 |
|
|
Damien Metzger
|
c7fe91a0a9
|
// Fixed traffic sources chart on dashboard
|
2013-10-29 16:38:40 +01:00 |
|
|
Damien Metzger
|
34aaeee0b5
|
// Fixed product images on the dashboard
|
2013-10-29 16:17:40 +01:00 |
|
|
Damien Metzger
|
4fe4d71361
|
// Stats cleaning
|
2013-10-29 15:29:55 +01:00 |
|
|
Damien Metzger
|
f06eb84d9f
|
// Stats cleaning
|
2013-10-29 14:36:27 +01:00 |
|
|
Damien Metzger
|
dabb23ac8d
|
// Added KPIs to the category page and fixed dashboard data
|
2013-10-29 11:03:09 +01:00 |
|
|
Kevin Granger
|
b3d7b8754b
|
// fixs date range picker Wip
|
2013-10-29 10:40:33 +01:00 |
|
|
Jerome Nadaud
|
dd10301413
|
// Fix tagify key events
|
2013-10-28 17:46:00 +01:00 |
|
|
Jerome Nadaud
|
38f034f4e0
|
// Remove header and footer display when ajax
|
2013-10-28 17:10:53 +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 |
|
|
Jerome Nadaud
|
5760718b85
|
// Add Save button to page header toolbar
|
2013-10-28 15:55:58 +01:00 |
|
|
Rémi Gaillard
|
1454a0d26a
|
// search type in BO
|
2013-10-28 15:32:26 +01:00 |
|
|
Damien Metzger
|
0aea146a4c
|
// Code cleaning stats modules
|
2013-10-28 13:39:39 +01:00 |
|
|
Damien Metzger
|
9c54dcce66
|
// Fixed default stats graph engine
|
2013-10-28 12:15:35 +01:00 |
|
|
Damien Metzger
|
08732eda50
|
// Fixed default selection in the stats submenu
|
2013-10-28 12:08:46 +01:00 |
|
|
Damien Metzger
|
b6799d4f2f
|
[*] BO : download attachments directly from the list
|
2013-10-28 11:57:40 +01:00 |
|
|
Damien Metzger
|
79b7521cac
|
Merge pull request #892 from djfm/bootstrap
// small fixes in English Email php templates
|
2013-10-28 02:21:50 -07:00 |
|
|
Kevin Granger
|
7126397bfe
|
// fix scroll vertical nav
|
2013-10-28 10:13:35 +01:00 |
|
|
djfm
|
4f8d153469
|
// fixed links in new English mails
|
2013-10-28 08:57:59 +00:00 |
|
|
djfm
|
38f45e3b2c
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-28 08:49:24 +00:00 |
|
|
Kevin Granger
|
8353bc5ac2
|
// fix attributes-color-container
|
2013-10-28 09:32:46 +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 |
|
|
Rémi Gaillard
|
8b1f9d0560
|
// small changes on admincms
|
2013-10-25 18:42:54 +02:00 |
|
|
Jerome Nadaud
|
8be88324f9
|
// Add internet explorer 9 Compat
|
2013-10-25 18:13:25 +02:00 |
|
|
Damien Metzger
|
e9a802cf23
|
[*] BO : Added the number of associated products in the product attachments list
|
2013-10-25 18:04:27 +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 |
|