Commit Graph

2669 Commits

Author SHA1 Message Date
Rémi Gaillard dc90450365 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 16:39:21 +01:00
Rémi Gaillard a7ed5ee869 // cleaning 2013-10-31 16:39:01 +01:00
Damien Metzger 3c1cdf4ef2 // Fixed new arrivals issue 2013-10-31 16:09:10 +01:00
Damien Metzger 9a1b45a8e6 // Fixed warning and prepared next commit 2013-10-31 15:09:14 +01:00
TMMeilleur 68a98b29a6 tm theme 2013-10-31 15:51:25 +02:00
Damien Metzger ff2954b1d2 [*] FO : Changed category block behavior inside categories 2013-10-31 12:20:59 +01:00
Rémi Gaillard b9ad576fb0 // -> mailsrc branch 2013-10-30 15:02:06 +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
Damien Metzger 0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +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
Sarah Lorenzini a49cc68b72 // news design sendtoafriend mails template 2013-10-25 15:01:05 +02:00
Sarah Lorenzini f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
djfm 3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Damien Metzger f6dd4a9ee4 // Code review 2013-10-24 17:49:18 +02:00
Sarah Lorenzini 1a7f9e6c11 // new design for blockwishlist mails template 2013-10-24 17:35:37 +02:00
Sarah Lorenzini 005a57b077 // new design for blocknewsletter mails template 2013-10-24 17:28:37 +02:00
Vincent Augagneur 6a552be7dd //followup now use bootstrap design 2013-10-24 17:23:40 +02:00
Vincent Augagneur f82322e426 //typo 2013-10-24 16:51:55 +02:00
Damien Metzger 2931c20914 // Fixed rounding 2013-10-24 16:38:48 +02:00
Sarah Lorenzini a44cdf785e // new design for followup module mail 2013-10-24 16:18:52 +02:00
Damien Metzger 6a2e847970 // dashboard improvements 2013-10-24 15:04:06 +02:00
Damien Metzger a9f75a02a7 // Added missing icons for modules 2013-10-24 14:15:44 +02:00
Damien Metzger a1df97776a // Set default values 2013-10-24 13:54:55 +02:00
Damien Metzger a34784a15d // Fixed chart for period before the store creation 2013-10-24 11:17:33 +02:00
Damien Metzger e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Vincent Augagneur b38073ad72 //watermark now use bootstrap design 2013-10-23 18:01:23 +02:00
Gregory Roussac c72c44f153 Merge pull request #877 from djfm/bootstrap
// English
2013-10-23 08:46:16 -07:00
djfm 52622e6be2 // English 2013-10-23 15:33:15 +00:00
Damien Metzger 466699edcb // Add units to goals configuration 2013-10-23 16:36:04 +02:00
Damien Metzger 9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Vincent Augagneur c61cec9f2a //display date on dashproducts && added param date_from & date_to on dashboard hooks 2013-10-23 09:59:16 +02:00
Damien Metzger a2be0364da // First draft goals 2013-10-22 19:59:18 +02:00
Jerome Nadaud 2c94e6c042 // Add level depth restriction on blockcategories 2013-10-22 19:13:10 +02:00
Jerome Nadaud dfa59fa8f7 // Fix blockcategories 2013-10-22 19:04:11 +02:00
Vincent Augagneur 537bfb0520 //dash configuration cancel button added 2013-10-22 18:04:08 +02:00
Jerome Nadaud 67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +02:00
Damien Metzger 04f0545254 // forgot to rename a field 2013-10-22 15:37:33 +02:00
Damien Metzger 1323befe2f // Add link to profitability conf 2013-10-22 15:36:46 +02:00
Damien Metzger 8ef9e71966 // Refine dashboard net profits 2013-10-22 15:16:22 +02:00
Damien Metzger b4499937d8 // Comparison is optionnal 2013-10-22 14:15:10 +02:00
Damien Metzger a4eeff4cd7 // Shortcuts for chart selection 2013-10-22 14:07:19 +02:00
Jerome Nadaud b6d6336e26 // Add date subtitle 2013-10-22 12:12:41 +02:00
Vincent Augagneur a62f9169d5 //missing file btn-primary => btn btn-default 2013-10-22 09:15:46 +02:00
Vincent Augagneur 8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00