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

206 Commits

Author SHA1 Message Date
Jerome Nadaud 6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud 0e4cb5bcd5 // Form group bootstraping 2013-10-09 18:59:20 +02:00
Vincent Augagneur e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud 483aa8ad7d // Add block name fieldset and input_row 2013-10-07 13:34:35 +02:00
Kevin Granger c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +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 9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud 2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +02:00
Damien Metzger 01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud 72f540ad3a // Add textbutton input type to form template 2013-09-25 11:28:41 +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 c1e6df873d // Fix birthday bootstrap design 2013-09-20 17:02:44 +02:00
Kevin Granger 76bf61c20a //fix double desc 2013-09-20 11:04:41 +02:00
Kevin Granger 51663f972e // fix scenes 2013-09-17 17:15:40 +02:00
Vincent Augagneur 3151064daf //small fix on helper form && option 2013-09-17 12:18:37 +02:00
Jérôme Nadaud 455904a59b // Some input fix 2013-09-17 10:13:00 +02:00
Jerome Nadaud a4103265e5 // Color picker 2013-09-16 18:17:29 +02:00
Jerome Nadaud 8f7cb72231 // Fix tabstop on language dropdown button 2013-09-16 14:35:28 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Jerome Nadaud 81b6ec93f9 // Add count down to text input 2013-09-12 17:59:25 +02:00
Jerome Nadaud 29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Damien Metzger c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud 617b58ba2f //Fix Text input desc error 2013-09-11 15:40:21 +02:00
Jerome Nadaud 49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Kevin Granger 8e1250dad1 // I hate <br /> 2013-09-06 11:13:18 +02:00
Kevin Granger 1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Kevin Granger b2fd886722 // add new tpl for navigation top/side 2013-09-05 19:07:57 +02:00
Kevin Granger d9a429eccc // update radio helper 2013-09-05 14:06:54 +02:00
Kevin Granger 22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
Kevin Granger 84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Rémi Gaillard 51083e17af // 2013-08-29 17:18:05 +02:00
Kevin Granger 7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Rémi Gaillard c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
Jerome Nadaud 00155d584e // Fix language bug 2013-08-28 09:23:29 +02:00
Jerome Nadaud 6e46d718f7 // Fix merge problem 2013-08-27 18:22:02 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Jerome Nadaud 00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Kevin Granger 9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
Kevin Granger d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Kevin Granger 1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Kevin Granger 72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00