dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,036 Commits 9 Branches 19 Tags
bfe6c070531b8e24ca73d0cb288d1603ec3429f8
Commit Graph
18036 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud bfe6c07053 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:17:25 +02:00
Jerome Nadaud e204cbf24e [+] BO : Page header toolbar 2013-08-28 10:17:07 +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 967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
Jerome Nadaud 068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +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 62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +02:00
Jerome Nadaud 083eba3431 // Small title fix 2013-08-27 18:25:06 +02:00
Jerome Nadaud 4f022c48f8 [+] BO : Products page header toolbar 2013-08-27 18:23:38 +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 787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +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
Jerome Nadaud f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click 2013-08-19 16:37:48 +02:00
Damien Metzger 415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Damien Metzger 1a81191c09 // Code cleaning 2013-08-19 15:14:05 +02:00
Jerome Nadaud d78ac1afe8 [-] BO : FixBug action link class 2013-08-19 15:01:56 +02:00
Jerome Nadaud 8cd8ede1a5 [+] BO : Add Highlighted class for default list row 2013-08-19 13:31:23 +02:00
Jerome Nadaud 4a2e545bc4 [+] BO : Products tab fieldset 2013-08-19 13:30:18 +02:00
Jerome Nadaud 21d5322e16 [-] BO : FixBug unset param icon 2013-08-19 12:00:43 +02:00
Jerome Nadaud 0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud a7f6e91ac0 [-] BO : FixBug #PSCFV-9329 Alias problem in order by 2013-08-19 10:35:43 +02:00
Jerome Nadaud dc4978ff57 [-] BO : FixBug valuation and real quantity sort 2013-08-19 10:28:02 +02:00
Jerome Nadaud 1138e8d01a [-] BO : FixBug Friendly URL change 2013-08-19 10:17:42 +02:00
Jerome Nadaud 13c5450ca1 [-] BO : FixBug sort bug on values count column 2013-08-19 09:50:01 +02:00
Damien Metzger 7f3652bea0 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file 2013-08-14 11:16:50 +02:00
Jerome Nadaud f73f84dbf2 [+] BO : Product information tab 2013-08-13 17:23:38 +02:00