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

1698 Commits

Author SHA1 Message Date
Vincent Augagneur 38e00f9080 //disabled push on dashboard by default 2013-09-05 11:47:57 +02:00
Vincent Augagneur 5fa8cc4d47 //added translation 2013-09-05 10:17:18 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Kevin Granger d5a25f063f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-04 18:56:32 +02:00
Kevin Granger 161c612c02 // fix modules list 2013-09-04 18:56:00 +02:00
Vincent Augagneur 6b2492b62c //added data into dashproducts module 2013-09-04 18:26:58 +02:00
Kevin Granger b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00
Kevin Granger 671d419c27 // Carrier Wizard with bootstrap WIP 2013-09-03 19:36:04 +02:00
gRoussac 6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Vincent Augagneur 4d3b378965 //added form date range picker on dashboard 2013-09-03 10:19:15 +02:00
Rémi Gaillard 6059b4301a // states list 2013-09-02 17:10:20 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +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
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 40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +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
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 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
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
Vincent Augagneur 0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Kevin Granger 4c92db8912 // Modules position 2013-08-27 19:08:53 +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
Vincent Augagneur 39c882cdb4 //small fix 2013-08-27 16:21:13 +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
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard 099baaef70 // small change on specific price rules after condition deletion 2013-08-21 19:14:59 +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 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 155fd516ba // Misplaced if 2013-08-19 14:41:08 +02:00
Jerome Nadaud 4a2e545bc4 [+] BO : Products tab fieldset 2013-08-19 13:30:18 +02:00
Jerome Nadaud 0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud 1138e8d01a [-] BO : FixBug Friendly URL change 2013-08-19 10:17:42 +02:00
Rémi Gaillard 24ac8582bf [*] BO: Warehouse name is now displayed on each product line orders 2013-08-14 15:02:30 +02:00
Vincent Augagneur ec39b9e701 [-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary 2013-08-14 14:19:52 +02:00
Jerome Nadaud f73f84dbf2 [+] BO : Product information tab 2013-08-13 17:23:38 +02:00