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

637 Commits

Author SHA1 Message Date
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
Vincent Augagneur bf7c38ef49 //carrier wizard fix 2013-08-01 11:28:53 +02:00
Damien Metzger ebe8d6294d // CSS fix for carrier wizard 2013-08-01 09:34:07 +02:00
Vincent Augagneur 33951c1834 //fixed carrier wizard summary range limit 2013-07-31 18:14:13 +02:00
Vincent Augagneur 32f23a79a4 //carrier wizard added validation fields 2013-07-31 17:33:09 +02:00
Vincent Augagneur 60ecfaafd2 //fixed bug on carrier wizard tabindex 2013-07-31 17:16:52 +02:00
Vincent Augagneur e3265dcb1b //carrier wizard range validation 404 when change range type 2013-07-31 11:12:01 +02:00
Vincent Augagneur 80c2e3ea60 //small fix on carrier wizard 2013-07-31 10:34:52 +02:00
jeromenadaud d68363fdda [-] FO : FixBug #PSCFV-9846 Bookmark title escape problem on special language 2013-07-31 10:24:14 +02:00
Vincent Augagneur cf694be5a1 //fixs carrier wizard 2013-07-30 17:46:44 +02:00
Vincent Augagneur 0e6f1598f7 [-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img 2013-07-29 18:36:50 +02:00
Vincent Augagneur 210d24343c [-] BO : fixed input action when set fees for all zones in carrier wizard 2013-07-29 10:47:20 +02:00
Jérôme Nadaud 95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
Rémi Gaillard 0d76af7f41 // debug deletion 2013-07-26 18:29:01 +02:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Jérôme Nadaud 07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
Jérôme Nadaud ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
Jérôme Nadaud cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Damien Metzger 87a4b75df4 [*] FO : updated Fancybox plug-in 2013-07-23 12:53:20 +02:00
Jérôme Nadaud 0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Jérôme Nadaud 794475a9cc [-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier 2013-07-22 14:33:16 +02:00
Jérôme Nadaud 1581a371c5 [-] BO : FixBug #PSCFV-9251 Meta Tag delete previous 2013-07-19 18:41:46 +02:00
Kevin Granger 0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Kevin Granger 02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
Jérôme Nadaud 672f2d9dd1 [-] BO : Fix bug #PSCFV-9395 Missing vertical separation between flags 2013-07-16 10:18:54 +02:00
Rémi Gaillard e34289b0b7 // fix product warehouses 2013-07-12 18:53:22 +02:00
Kevin Granger f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Kevin Granger ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
Kevin Granger 1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
gRoussac f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products 2013-07-01 11:32:09 +02:00
Kevin Granger d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Damien Metzger 42f8a0a67a [*] BO : improved unicode characters replacement in URLs 2013-06-28 12:19:20 +02:00
Damien Metzger 57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
Damien Metzger 7427efdb6f // Added addlashes for some js messages 2013-06-26 15:52:40 +02:00
Vincent Augagneur 4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +02:00
Vincent Augagneur c8a67fbc40 [+] CORE : new jquery UI version (1.10.3) 2013-06-25 11:16:04 +02:00
Vincent Augagneur fe4b5eff1a [-] BO : fixed bug #PSCFV-7634 - Add non-existent new product to order using autocomplete gives javascript error (data.products is not defined) 2013-06-25 10:37:17 +02:00
Kevin Granger aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
gRoussac 5563c53133 [-] BO : missing colspan after update product detail 2013-06-20 16:39:15 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Kevin Granger 3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00