Commit Graph
428 Commits
Author SHA1 Message Date
Jerome Nadaud 0e4cb5bcd5 // Form group bootstraping 2013-10-09 18:59:20 +02:00
Jerome Nadaud 2d9a54c19e // Remove button icon class 2013-10-09 18:43:22 +02:00
Jerome Nadaud eae76eb63e // Pagination bootstraping 2013-10-09 18:36:19 +02:00
Jerome Nadaud d4bf765dd6 // Pagination bootstraping 2013-10-09 18:31:51 +02:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Damien Metzger 623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Vincent Augagneur e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Jerome Nadaud b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Kevin Granger 3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Jerome Nadaud 483aa8ad7d // Add block name fieldset and input_row 2013-10-07 13:34:35 +02:00
Kevin Granger 2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-04 19:13:13 +02:00
Kevin Granger c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Damien Metzger 337725bb86 // Fixed KPI with 0 value 2013-10-04 17:28:03 +02:00
Jerome Nadaud 5b203cf789 // Remove languages select when only one language 2013-10-04 13:51:38 +02:00
Kevin Granger 19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:39:03 +02:00
Kevin Granger f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Jerome Nadaud 7454d75fb9 // List simple header bootstraping 2013-10-02 17:08:28 +02:00
Jerome Nadaud 68c5318706 // Icon change for list details button 2013-10-02 14:49:42 +02:00
Jerome Nadaud a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
Jerome Nadaud 14b584fc01 // Remove language select if exist only 1 language 2013-10-01 14:36:48 +02:00
Kevin Granger 0db013f1c8 // fix checkbox 2013-09-30 15:13:08 +02:00
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
Jerome Nadaud 9e58e3edfd // Advanced stock bootstrap design 2013-09-27 12:24:44 +02:00
Jerome Nadaud 9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud bc80846d7d // Requiered fields bootstrap design 2013-09-26 16:25:18 +02:00
Jerome Nadaud 2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +02:00
Jerome Nadaud 10e472e141 // List header template - Remove extra class attribute 2013-09-26 11:35:19 +02:00
Damien Metzger cc75b4b912 // Temp fix for labels in the BO listings, before my eyes hurt 2013-09-25 19:59:00 +02:00
Damien Metzger 01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud b2b8a2eb19 // Fix list search form submit 2013-09-25 16:04:09 +02:00
Jerome Nadaud ffb7113153 // Posibility to add a specifici icon to options list 2013-09-25 15:16:00 +02:00
Jerome Nadaud 72f540ad3a // Add textbutton input type to form template 2013-09-25 11:28:41 +02:00
Jerome Nadaud 479662aa10 // Fix missing table id for shop asso in helper 2013-09-24 16:19:38 +02:00
Jerome Nadaud 6e2337df44 // Add id attribute to tree header button 2013-09-24 12:27:51 +02:00
Jerome Nadaud 18a621e022 // Multistore invisible description in options 2013-09-23 19:02:22 +02:00
Jerome Nadaud 320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Jerome Nadaud 234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +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
Jerome Nadaud c1e6df873d // Fix birthday bootstrap design 2013-09-20 17:02:44 +02:00
Jerome Nadaud caa1dbc7ea //Fix tree search toolbar button design 2013-09-20 15:39:44 +02:00
Jerome Nadaud f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Kevin Granger 76bf61c20a //fix double desc 2013-09-20 11:04:41 +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