 Vincent Augagneur
|
d71a6a90da
|
//now blockstore use bootstrap design
|
2013-09-23 09:48:59 +02:00 |
|
|
Vincent Augagneur
|
c1a9aa5936
|
//helper form input type file now can display thumb
|
2013-09-23 09:45:20 +02:00 |
|
|
Jerome Nadaud
|
67f05340c0
|
// Remove list header button link title and remove shop column center
|
2013-09-23 09:18:44 +02:00 |
|
|
Kevin Granger
|
c93eb9f40a
|
// orders WIP
|
2013-09-20 19:11:08 +02:00 |
|
|
Damien Metzger
|
214b844ef7
|
// Removed useless tiny mce src
|
2013-09-20 18:52:42 +02:00 |
|
|
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
|
5c3b8015e5
|
[-] BO : fixed the redirection to a 404 page when loging in in the updater
|
2013-09-20 18:21:10 +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 |
|
|
Rémi Gaillard
|
7aa348eb93
|
// bad char
|
2013-09-20 15:48:22 +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 |
|
|
gRoussac
|
e2a1f5101c
|
[-] BO : Bad input radio names
|
2013-09-20 15:27:31 +02:00 |
|
|
gRoussac
|
7d05da1618
|
[-] IN : Lower by two flush limit in migrate_orders
|
2013-09-20 15:12:57 +02:00 |
|
|
gRoussac
|
429c9442a3
|
[*] CORE : bad else if in getTemplatePath
|
2013-09-20 15:10:14 +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 |
|
|
Rémi Gaillard
|
2dc91758c3
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-20 14:12:56 +02:00 |
|
|
Rémi Gaillard
|
9b878a33a8
|
// fix canonical and ssl page without ssl
|
2013-09-20 14:12:41 +02:00 |
|
|
Damien Metzger
|
fc42ce17b8
|
// Set default option for the menu in the installer
|
2013-09-20 14:08:26 +02:00 |
|
|
Damien Metzger
|
7eb3b22829
|
[-] Installer : added the missing default tab in the employee
|
2013-09-20 14:06:38 +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 |
|
|
Rémi Gaillard
|
e2ac223f4e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-20 11:34:54 +02:00 |
|
|
Rémi Gaillard
|
5b7580d487
|
[-] MO: Fix time of smarty cache invalidation
|
2013-09-20 11:33:30 +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 |
|
|
Damien Metzger
|
1cebd5920e
|
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
|
2013-09-20 11:09:22 +02:00 |
|
|
Kevin Granger
|
76bf61c20a
|
//fix double desc
|
2013-09-20 11:04:41 +02:00 |
|
|
Fabio Chelly
|
4f639329e9
|
Merge remote-tracking branch 'origin/development' into development
|
2013-09-20 10:47:17 +02:00 |
|
|
Fabio Chelly
|
91ae972655
|
[-] MO mailalert : products alerts can be registered for multiple guests
#PNM-1669
|
2013-09-20 10:46:56 +02:00 |
|
|
Jerome Nadaud
|
74a262f2ed
|
// Shopping carts bootsrap design
|
2013-09-20 10:29:32 +02:00 |
|
|
Damien Metzger
|
f8ca06d927
|
// Better cache depth management for smarty
|
2013-09-20 10:26:58 +02:00 |
|
|
Damien Metzger
|
eb6600e840
|
// Blockcustomerprivacy should not be installed by default
|
2013-09-20 10:26:58 +02:00 |
|