dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 9 Branches 19 Tags
5832ab3eb5d62a81b427ff5f7c8bdea7d94ec00a
Commit Graph

1971 Commits

Author SHA1 Message Date
Vincent Augagneur
73f40a6cc6 //fixed carrier wizard typewatch 2013-08-07 17:29:44 +02:00
gRoussac
82621c08ec [-] BO : Do not display root category bool if addrootcategory not in url 2013-08-07 11:51:48 +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
478e338df0 //added active field on carrier wizard 2013-08-06 11:40:03 +02:00
gRoussac
a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
 2013-08-06 10:42:44 +02:00
Vincent Augagneur
3a75a783f6 //added label on carrier zones && improve range validation 2013-08-05 16:54:36 +02:00
gRoussac
a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
jeromenadaud
48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
Gregory Roussac
07181a37f5 Merge pull request #413 from ccauw/patch-9 
[-] BO : bug color parameter in List
 2013-08-05 06:37:46 -07:00
Vincent Augagneur
5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Rémi Gaillard
003c05a729 [-] BO: Fix #PSCFV-9885 catalog price rules edition 2013-08-05 09:55:29 +02:00
Gregory Roussac
47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07: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
f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur
9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Vincent Augagneur
ac48c1b786 //remove inline css 2013-08-01 18:26:39 +02:00
Vincent Augagneur
1447be6f3c //fixed bug when changing range type 2013-08-01 17:16:52 +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
dfb1924884 //carrier wizard fix when edit a carrier 2013-08-01 11:47:39 +02:00
Vincent Augagneur
e1fa26d002 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-31 17:33:19 +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
gRoussac
5e0b5db23b [*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614 2013-07-31 15:16:42 +02:00
Vincent Augagneur
69944e1618 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-31 14:31:27 +02:00
Vincent Augagneur
175427cb2e //fixed input text not disabled when change range behavior 2013-07-31 14:31:23 +02:00
Axome
1187e7cb09 [*] BO : Fix statistics redirection when change date 
When going into a special stats module (for exemple "statsproduct") if you change the date, Prestashop redirect to the "home" of statistics.
 2013-07-31 14:15:33 +02:00
Nils-Helge Garli Hegvik
b362c808dc Fixed fieldset issue when customer is a guest 2013-07-31 12:25:35 +02:00
Vincent Augagneur
e3265dcb1b //carrier wizard range validation 404 when change range type 2013-07-31 11:12:01 +02:00
Vincent Augagneur
be7e4b4128 //carrier wizard Shipping and handling are set to no by default 2013-07-31 11:00:31 +02:00
Vincent Augagneur
80c2e3ea60 //small fix on carrier wizard 2013-07-31 10:34:52 +02:00
jeromenadaud
0e3f2d6a82 [-] BO : FixBug Invalid offset when only one error in layout 2013-07-31 09:18:13 +02:00
gRoussac
f28a480bf9 // remove console.log 2013-07-30 20:36:38 +02:00
gRoussac
6600112ab1 [-] BO : Fix onchange event on Adminmodules list execption 2013-07-30 20:28:06 +02:00
gRoussac
edb8cce49f //norms 2013-07-30 19:57:23 +02:00
gRoussac
d6856a5c62 //norms 2013-07-30 19:18:29 +02:00
Gregory Roussac
800c63036e Merge pull request #605 from Captain-FLAM/patch-10 
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
 2013-07-30 09:48:11 -07:00
Captain-FLAM
be613fa008 fixup! [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 2013-07-30 17:42:50 +01:00
Vincent Augagneur
fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
Vincent Augagneur
cf694be5a1 //fixs carrier wizard 2013-07-30 17:46:44 +02:00
Kevin Granger
062a4250cc //fixed unclosed div 2013-07-30 15:26:00 +02:00
Damien Metzger
f59bd2f55f Merge pull request #612 from djfm/development 
// Reviewed CarrierWizard strings, and corrected a few glitches with smarty translation functions and quotes
 2013-07-30 06:13:10 -07:00
djfm
cba79bdcd6 // corrected quote problems in the translation files 2013-07-30 09:47:02 +00:00
djfm
9ba17d642a // CarrierWizard: English Strings reviewed and corrected 2013-07-30 09:30:41 +00:00
Vincent Augagneur
5929727be1 Merge pull request #601 from PrestaEdit/carrier_wizard2 
[-] Carrier Wizard: fix
 2013-07-30 02:22:45 -07:00
Gregory Roussac
53c195e9d9 Merge pull request #610 from indesign47/patch-8 
[*] BO : shipping enlarge listbox carriers
 2013-07-29 09:38:59 -07: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
indesign47
b8dc750547 [*] BO : shipping enlarge listbox carriers 
enlarge listbox carriers to see all the name of the carrier
 2013-07-29 18:25:05 +02:00