dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,647 Commits 9 Branches 19 Tags
c23f01cdc8b06daedf74a93039826ef38322a2f8
Commit Graph
373 Commits
Author SHA1 Message Date
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
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
Kevin Granger bcfd092a1d // fix nav 2013-09-13 17:48:46 +02:00
Kevin Granger b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +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
Jerome Nadaud c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Damien Metzger c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Jerome Nadaud e9dbadcabf // Tree 2013-09-11 20:41:14 +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 f29b1b3a31 // perts fix + menu top WIP 2013-09-10 20:23:06 +02:00
Jerome Nadaud e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Jerome Nadaud 85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Kevin Granger 03d1697e19 // treeview helper 2013-09-10 09:41:39 +02:00
Kevin Granger 2a7bc49190 // treeview 2013-09-09 19:03:38 +02:00
Jerome Nadaud accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
Jerome Nadaud 36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +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
Sarah Lorenzini f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +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
Jerome Nadaud 48dd826f7d [-] BO : List header module position fix 2013-09-02 09:47:35 +02:00
Kevin Granger 84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Jerome Nadaud aab9933ff2 // Fix price option render 2013-08-30 17:27:25 +02:00
Kevin Granger d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +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
Kevin Granger c5ab91f171 [+] BO dashboard WIP 2013-08-29 14:52:14 +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