 Jerome Nadaud
|
0e87409bd6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-20 18:31:47 +02:00 |
|
|
Jerome Nadaud
|
8e1cb5cc34
|
// Kpi update for customers orders
|
2013-09-20 18:31:35 +02:00 |
|
|
Damien Metzger
|
dadf83d6f6
|
[*] BO : removed deprecated chart engines
|
2013-09-20 18:27:35 +02:00 |
|
|
Damien Metzger
|
1fe17f0eb1
|
// Removed deprecated option form in stats
|
2013-09-20 18:18:04 +02:00 |
|
|
Damien Metzger
|
ed1574e9ed
|
// Finished nvd3 chart
|
2013-09-20 18:12:10 +02:00 |
|
|
Damien Metzger
|
02e5913dd6
|
// Fixed potential warning
|
2013-09-20 18:12:10 +02:00 |
|
|
Vincent Augagneur
|
504485cef3
|
//blockspecials now use bootstrap design
|
2013-09-20 17:51:24 +02:00 |
|
|
Vincent Augagneur
|
4136697c5e
|
//blocksocial now use boostrap design
|
2013-09-20 17:22:15 +02:00 |
|
|
Vincent Augagneur
|
e332de1d50
|
//blockrss now use boostrap design
|
2013-09-20 17:14:50 +02:00 |
|
|
Jerome Nadaud
|
3ef36400bf
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-20 17:02:55 +02:00 |
|
|
Jerome Nadaud
|
c1e6df873d
|
// Fix birthday bootstrap design
|
2013-09-20 17:02:44 +02:00 |
|
|
Vincent Augagneur
|
24b6d3d387
|
//blockpaymentlogo now use boostrap design
|
2013-09-20 17:02:15 +02:00 |
|
|
Vincent Augagneur
|
4b4622a1c7
|
//blocknewsletter now use boostrap design
|
2013-09-20 16:52:48 +02:00 |
|
|
Vincent Augagneur
|
b7045b998a
|
//blocknewproducts now use boostrap design
|
2013-09-20 16:41:31 +02:00 |
|
|
Jerome Nadaud
|
e9cd8ac145
|
// Search tree toolbar button
|
2013-09-20 16:20:27 +02:00 |
|
|
Jerome Nadaud
|
f44ecb9fc8
|
// Products section list adjustment
|
2013-09-20 16:19:50 +02:00 |
|
|
Jerome Nadaud
|
caa1dbc7ea
|
//Fix tree search toolbar button design
|
2013-09-20 15:39:44 +02:00 |
|
|
Jerome Nadaud
|
f51ffe4c55
|
// Start design of multistore toolbar
|
2013-09-20 15:30:59 +02:00 |
|
|
Jerome Nadaud
|
f312a055b1
|
// Multistore bootstrap design
|
2013-09-20 15:04:43 +02:00 |
|
|
Vincent Augagneur
|
2f3d736f13
|
//blockmanufacturer is now using bootstrap design
|
2013-09-20 14:56:41 +02:00 |
|
|
Kevin Granger
|
eeb3b540e2
|
// orders + css highlight / fixed-width
|
2013-09-20 14:42:09 +02:00 |
|
|
Damien Metzger
|
fc42ce17b8
|
// Set default option for the menu in the installer
|
2013-09-20 14:08:26 +02:00 |
|
|
vAugagneur
|
aef0897436
|
//blockcustomerprivacy now use bootstrap design
|
2013-09-20 13:22:35 +02:00 |
|
|
vAugagneur
|
23ecca163d
|
//blockcontactinfos is now using bootstrap design
|
2013-09-20 11:46:02 +02:00 |
|
|
vAugagneur
|
4c5cd50345
|
/small fix
|
2013-09-20 11:38:39 +02:00 |
|
|
vAugagneur
|
2f56a4dbbd
|
//blockcontact is now using bootstrap design
|
2013-09-20 11:31:12 +02:00 |
|
|
vAugagneur
|
c7ebf5ba5d
|
//blockcart is now using bootstrap design
|
2013-09-20 11:24:16 +02:00 |
|
|
vAugagneur
|
07c03ecf6d
|
//blockcategories is now using bootstrap design
|
2013-09-20 11:18:30 +02:00 |
|
|
Kevin Granger
|
76bf61c20a
|
//fix double desc
|
2013-09-20 11:04:41 +02:00 |
|
|
Jerome Nadaud
|
74a262f2ed
|
// Shopping carts bootsrap design
|
2013-09-20 10:29:32 +02:00 |
|
|
Kevin Granger
|
724ab12122
|
// orders cleanup
|
2013-09-19 20:12:05 +02:00 |
|
|
Jerome Nadaud
|
660bb870cc
|
// Add tooltip to list header toolbar button
|
2013-09-19 19:45:21 +02:00 |
|
|
Jerome Nadaud
|
c0fa5f8f79
|
// Fix hint in options.tpl
|
2013-09-19 19:39:46 +02:00 |
|
|
Jerome Nadaud
|
39edb5a546
|
// Fix cart rules bootstrap design
|
2013-09-19 19:33:55 +02:00 |
|
|
Jerome Nadaud
|
9b308ae7fc
|
// Fix Translatable field on cart rule information
|
2013-09-19 19:01:43 +02:00 |
|
|
Jerome Nadaud
|
e1a3440145
|
// Add array for hint and desc for options.tpl
|
2013-09-19 18:56:35 +02:00 |
|
|
Jerome Nadaud
|
b40b9ec328
|
// Fix Permissions
|
2013-09-19 18:26:42 +02:00 |
|
|
Jerome Nadaud
|
e6780f7a86
|
// Fix menu list position col
|
2013-09-19 18:08:20 +02:00 |
|
|
Jerome Nadaud
|
f8fed30b44
|
// Prevent enter key event propagation for search input
|
2013-09-19 18:07:50 +02:00 |
|
|
Damien Metzger
|
33405ed858
|
// Rollback file wrongly modified by previous commit
|
2013-09-19 17:57:29 +02:00 |
|
|
Damien Metzger
|
cda7b225e2
|
// Removed deprecated module
|
2013-09-19 17:57:29 +02:00 |
|
|
Jerome Nadaud
|
2e80f00ba2
|
// Remove console log
|
2013-09-19 17:39:11 +02:00 |
|
|
Jerome Nadaud
|
48d7e43f1c
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 17:38:19 +02:00 |
|
|
Jerome Nadaud
|
6f483a87a9
|
// Fix hide language on ajax load
|
2013-09-19 17:38:07 +02:00 |
|
|
Sarah Lorenzini
|
550f6c190b
|
// update stats tabs
|
2013-09-19 17:36:27 +02:00 |
|
|
Vincent Augagneur
|
97cff2210f
|
//removed unused code
|
2013-09-19 17:01:20 +02:00 |
|
|
Vincent Augagneur
|
53e046c4b5
|
//removed unused code
|
2013-09-19 17:00:50 +02:00 |
|
|
Kevin Granger
|
f222bb7b7f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 16:58:12 +02:00 |
|
|
Kevin Granger
|
650001024a
|
// orders cleanup
|
2013-09-19 16:55:06 +02:00 |
|
|
Vincent Augagneur
|
2b2b502ba2
|
//blockbestsellers && bankwire now use displayError & displayConfirmation
|
2013-09-19 16:55:04 +02:00 |
|