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

3299 Commits

Author SHA1 Message Date
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
indesign47 d76059ff23 [*] BO : skip the first line by default 
All sample csv file use a first line of information
 2013-07-29 17:19:46 +02:00
Sarah Lorenzini 101d9283ae // update wizard 2013-07-29 15:12:50 +02:00
PrestaEdit c1b0d32d32 [-] Carrier Wizard: fix 2013-07-29 13:57:31 +02:00
Captain-FLAM 0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
 2013-07-29 12:35:02 +01:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Shagshag 21cf113c44 twice class attribute in color input 2013-07-25 10:26:53 +02:00
Gregory Roussac 063fd9941c Merge pull request #189 from PrestaEdit/patch-12 
[*] BO: use lang for input file
 2013-07-24 03:10:00 -07:00
Gregory Roussac 1c71dc54dc Merge pull request #556 from piotrmocko/patch-2 
[-] Bo : Payment currency restriction incorret type of input for radio
 2013-07-23 10:21:20 -07:00
Gregory Roussac 3b213a505c Merge pull request #583 from djfm/development 
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
 2013-07-23 00:59:31 -07:00
Jérôme Nadaud 0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Rémi Gaillard d79365fe4d // small fix 2013-07-22 11:54:35 +02:00
Rémi Gaillard b8d272a459 // fix entities 2013-07-22 11:39:15 +02:00
djfm 3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
Jérôme Nadaud 5646e682bc [-] BO : FIxBug Correct image language in product 2013-07-19 15:21:06 +02:00
Gregory Roussac ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41 
[*] BO: more than one image in HelperForm
 2013-07-17 07:44:26 -07:00
gRoussac c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate 
Conflicts:
	admin-dev/header.inc.php
 2013-07-17 16:31:49 +02:00
gRoussac 1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
Gregory Roussac 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 
[*] BO: hook displayAdminForm / add param fieldset
 2013-07-12 08:56:42 -07:00
Gregory Roussac 5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 
[-] PDF : Get correct prefix for invoices
 2013-07-12 08:44:24 -07:00
Gregory Roussac 0453698f50 Merge pull request #557 from BigZ/patch-1 
[-] BO : Update documents listing to display proper prefix
 2013-07-12 08:37:21 -07:00
Damien Metzger 4e0723b3cc [-] BO : fixed charts and grids in multishop #PSCFV-8978 2013-07-12 16:29:31 +02:00
BigZ f1049c021a get correct prefix for invoices 
One must use the shop id when getting invoices prefix
 2013-07-12 03:43:03 +02:00
BigZ bd432641a0 update documents listing to display proper prefix 
In order details, generic prefix was displayed in right column instead of shop specific prefix
 2013-07-12 02:32:52 +02:00
Piotr Moćko 68d135b4cf Payment currency restriction incorret type of input for radio 
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
 2013-07-11 18:56:50 +02:00
Rémi Gaillard 12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00