dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

556 Commits

Author SHA1 Message Date
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
Jerome Nadaud e1a3440145 // Add array for hint and desc for options.tpl 2013-09-19 18:56:35 +02:00
Jerome Nadaud f8fed30b44 // Prevent enter key event propagation for search input 2013-09-19 18:07:50 +02:00
Jerome Nadaud 33943ef66a // Date range filter 2013-09-19 16:23:26 +02:00
Jerome Nadaud eb1531a0b3 // Fix textlang size and textarea input group 2013-09-19 11:23:09 +02:00
Jerome Nadaud 38d565110f // List header fix 2013-09-18 17:23:22 +02:00
Jerome Nadaud 1f3e717eb6 // Preferences - Admin bootstrap fix 2013-09-18 16:22:05 +02:00
Jerome Nadaud 0683ed4092 // Some list design fix 2013-09-18 15:25:58 +02:00
Kevin Granger b71b594ca1 // fix tree search / title / manufacturers 2013-09-18 15:00:10 +02:00
Jerome Nadaud c48f4f5e1b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-18 10:44:19 +02:00
Jerome Nadaud 5a206e83a8 // Security 2013-09-18 10:43:58 +02:00
Damien Metzger 50a9e7ef99 // Code cleaning 2013-09-18 10:29:19 +02:00
Kevin Granger 51663f972e // fix scenes 2013-09-17 17:15:40 +02:00
Damien Metzger f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Jérôme Nadaud 47341ce0bb // Attributes generator 2013-09-17 12:33:06 +02:00
Vincent Augagneur 3151064daf //small fix on helper form && option 2013-09-17 12:18:37 +02:00
Kevin Granger 5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Jérôme Nadaud 455904a59b // Some input fix 2013-09-17 10:13:00 +02:00
Damien Metzger 8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Jerome Nadaud 80b6d5a570 // fix autosize for textarea in options.tpl 2013-09-16 18:28:57 +02:00
Jerome Nadaud a4103265e5 // Color picker 2013-09-16 18:17:29 +02:00
Kevin Granger 7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Jerome Nadaud 8f7cb72231 // Fix tabstop on language dropdown button 2013-09-16 14:35:28 +02:00