dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,141 Commits 9 Branches 19 Tags
c7e4f0ce5f7fe7bf18dcdaeec2fa236249b10f34
Commit Graph
479 Commits
Author SHA1 Message Date
Vincent Augagneur 3c2a086296 //merge 2013-09-05 19:10:59 +02:00
Vincent Augagneur 4b2ef10dd6 //dashboard data-chart-line added 2013-09-05 19:07:49 +02:00
Rémi Gaillard a3233cc00c // 2013-09-05 18:51:53 +02:00
Rémi Gaillard c35d8c7845 // 2013-09-05 18:47:13 +02:00
Rémi Gaillard f5e00a59f7 // 2013-09-05 18:41:51 +02:00
Rémi Gaillard 8868271c07 // push changes 2013-09-05 18:37:25 +02:00
Vincent Augagneur 06b54d0519 //typo 2013-09-05 16:35:15 +02:00
Damien Metzger c306b2a425 // Small fix dashboard push 2013-09-05 15:41:10 +02:00
Vincent Augagneur c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Vincent Augagneur 1c88bdd24e //dashboard widget regardless refresh 2013-09-05 11:52:18 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +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 2990497a26 // header notifications 2013-09-03 12:25:48 +02:00
Vincent Augagneur f165dae15d //now you can refresh each dashboard module you want 2013-09-02 17:22:51 +02:00
Vincent Augagneur 81c47a085e //fix remove class loading 2013-09-02 15:41:28 +02:00
Vincent Augagneur f778b0da25 //remove class loading after widget filling 2013-09-02 15:09:27 +02:00
Vincent Augagneur 0cf96cd059 //small fix 2013-09-02 14:58:17 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
Vincent Augagneur a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +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 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 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
Jerome Nadaud a0d870c4eb [+] BO : Button action list improvements 2013-08-13 10:10:24 +02:00
Jerome Nadaud ad1efa612f [+] BO : Better SendBulkAction function 2013-08-08 09:44:52 +02:00
Jerome Nadaud 65271a9385 [-] BO : FixBug Bulk action sended on filter 2013-08-07 18:42:43 +02:00
Jerome Nadaud 5f1506ffc2 [-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country 2013-08-07 14:09:40 +02:00
Jerome Nadaud 816a39fb4f [+] BO : Footer list bulk actions 2013-08-07 10:43:53 +02:00
Vincent Augagneur 67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation 2013-08-06 18:04:12 +02:00
Vincent Augagneur 88d4f57894 //carrier range validation fix 2013-08-06 10:04:54 +02:00
Vincent Augagneur ea10b94ef2 //onkeypress enter to validate range 2013-08-05 18:02:08 +02:00
Vincent Augagneur cf9d20f83b //range overlapping bug fix 2013-08-05 17:43:31 +02:00
Vincent Augagneur 3a75a783f6 //added label on carrier zones && improve range validation 2013-08-05 16:54:36 +02:00
Vincent Augagneur 5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Vincent Augagneur be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard 2013-08-02 17:29:15 +02:00
Vincent Augagneur f55a8c2dd5 //remove debug 2013-08-02 11:38:38 +02:00
Vincent Augagneur 02fdc5fe24 //fixed float validation on carrier wizard 2013-08-02 11:25:08 +02:00
Vincent Augagneur f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur 46d0663b2f //remove debug 2013-08-02 10:29:30 +02:00
Vincent Augagneur 9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Kevin Granger 32b50b4dad // small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep) 2013-08-01 20:25:36 +02:00
Vincent Augagneur fa958c9a5e //carrier wizard currency sign bug 2013-08-01 17:13:08 +02:00
Vincent Augagneur adede4f7ea //small fix 2013-08-01 16:11:50 +02:00
Vincent Augagneur c0db0bfca9 //Added currency sign and weigh unit on carrier wizard 2013-08-01 16:03:14 +02:00
Vincent Augagneur 79a4a84163 //small fix on carrier wizard oups 2013-08-01 15:41:42 +02:00
Vincent Augagneur f5454748b2 //small fix on carrier wizard 2013-08-01 15:41:01 +02:00
Vincent Augagneur c9b1546a2e //disabled all fess when carrier is free 2013-08-01 15:23:26 +02:00