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

3497 Commits

Author SHA1 Message Date
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
Vincent Augagneur b882ecfbbc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 11:44:01 +02:00
Vincent Augagneur a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +02:00
Kevin Granger 735b20866b // BO Bootstrap Search result page 2013-09-02 11:02:23 +02:00
Kevin Granger 0a8a4dcece // BO Stats : Date Picker + Layout WIP 2013-09-02 10:47:07 +02:00
Vincent Augagneur d8c4483265 //oups 2013-09-02 10:13:47 +02:00
Vincent Augagneur d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +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
Kevin Granger 0c494912a4 // BO fix product tabs 2013-08-30 11:51:57 +02:00
Kevin Granger e4d58b7528 // submenu .active link 2013-08-30 11:13:28 +02:00
Kevin Granger 357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Kevin Granger 40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +02:00
Kevin Granger 7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Damien Metzger 36815be192 // Fixed warning 2013-08-29 16:33:06 +02:00
Kevin Granger c07f226dd4 // fix dashboard gfx 2013-08-29 16:17:40 +02:00
Kevin Granger 618d980dc7 [+] add css for graph and temp avatar 2013-08-29 15:48:14 +02:00
Kevin Granger c5ab91f171 [+] BO dashboard WIP 2013-08-29 14:52:14 +02:00
Kevin Granger 8660a24d55 [+] Dashboard Markup WIP 2013-08-28 19:26:19 +02:00
Jerome Nadaud 4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Kevin Granger 97e342984d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:07:02 +02:00
Kevin Granger ecb4d65347 // list toolbar 2013-08-28 10:06:52 +02:00
Vincent Augagneur 0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Jerome Nadaud 00155d584e // Fix language bug 2013-08-28 09:23:29 +02:00
Kevin Granger 4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00
Jerome Nadaud e64e81efa7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-27 18:57:09 +02:00
Jerome Nadaud 64b575911a [+] BO : Add list refresh button 2013-08-27 18:56:47 +02:00
Kevin Granger 9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Jerome Nadaud f60fe74336 [+] BO : Tracking page header toolbar 2013-08-27 18:22:54 +02:00
Jerome Nadaud 6e46d718f7 // Fix merge problem 2013-08-27 18:22:02 +02:00
Jerome Nadaud ed0037c435 [+] BO : New page header toolbar 2013-08-27 18:21:27 +02:00
Jerome Nadaud eb78f766c3 // Fix for panel heading 2013-08-27 14:19:38 +02:00
Jerome Nadaud 2426eac605 [+] BO : Add first action on menu icon list 2013-08-27 14:18:45 +02:00
Jerome Nadaud 946840ae45 // Small id fix 2013-08-26 18:39:38 +02:00
Kevin Granger a972de046e // fix Modules page 2013-08-26 12:26:41 +02:00
Kevin Granger f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger b2f0a8aea9 // fix switch + ignore bower_components 2013-08-21 19:28:32 +02:00
Kevin Granger 3f8649b6b4 // cleaning components + fix form input, switch 2013-08-21 19:16:04 +02:00
Jerome Nadaud f6515a39eb [+] BO : List header new toolbar functionality 2013-08-21 17:52:23 +02:00
Kevin Granger 93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout 2013-08-21 17:17:24 +02:00
Jerome Nadaud d6b50a7f0c // Merge Dev + Bootstrap 2013-08-21 15:27:14 +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
Kevin Granger 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud 00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
Jerome Nadaud 41190a66d4 [+] BO : Product tab fieldset and accordion fix 2013-08-19 18:45:57 +02:00
Jerome Nadaud 5336467e04 [-] BO : FixBug Friendly URL by language 2013-08-19 17:51:53 +02:00
Jerome Nadaud 68d7a320cd [-] BO : FixBug Friendly URL change 2013-08-19 17:48:58 +02:00