dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,109 Commits 9 Branches 19 Tags
5fa8cc4d47c93d83d8a754dd0d28dd022059f57a
Commit Graph
18109 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jeromenadaud 24a70479d3 [-] BO : FixBug Module list template 2013-07-30 18:06:35 +02:00
Vincent Augagneur d50b8c679f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 18:02:46 +02:00
Vincent Augagneur fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
jeromenadaud 9bf6871e8d [-] FO : FixBug #PSCFV-9766 All products in products list for email confirmation with multi-shipping 2013-07-30 17:50:36 +02:00
Vincent Augagneur cf694be5a1 //fixs carrier wizard 2013-07-30 17:46:44 +02:00
Sarah Lorenzini 635076a7ad // update localization tab 2013-07-30 17:45:50 +02:00
jeromenadaud a93667a58b [-] FO : FixBug Wrong offset in more than one shipping address 2013-07-30 17:03:15 +02:00
Kevin Granger 062a4250cc //fixed unclosed div 2013-07-30 15:26:00 +02:00
jeromenadaud 6ddf2ee1ab [-] BO : FixBug allow_url_fopen on BackOffice home page 2013-07-30 15:19:54 +02:00
Damien Metzger d9ce51f38c Merge pull request #613 from djfm/nl_installer 
[*] LO : Added Dutch Installer
 2013-07-30 06:14:40 -07: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 28c0ef2b7d // added a few translations to NL installer 2013-07-30 13:07:14 +00:00
Sarah Lorenzini faafe4167a // update localization tab 2013-07-30 14:56:39 +02:00
Sarah Lorenzini 816153687c // update localization tab 2013-07-30 12:25:20 +02:00
djfm cba79bdcd6 // corrected quote problems in the translation files 2013-07-30 09:47:02 +00:00
Vincent Augagneur 3d40814739 //added name in errors array in validateRules 2013-07-30 11:33:30 +02: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
Vincent Augagneur 3814a8c735 [-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix 2013-07-30 10:40:13 +02:00
gRoussac 4185026880 [-] CORE : Fix warning #PSCFV-9678 when sending message to customer 2013-07-30 10:37:07 +02:00
Kevin Granger 8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields 2013-07-30 10:35:47 +02:00
gRoussac a36ac7784d // trailing space 2013-07-30 10:35:23 +02:00
Jérôme Nadaud 7d57255b70 [-] BO : FixBug #PSCFV-9959 file_get_contents error 2013-07-30 10:27:55 +02:00
Damien Metzger 192940946d // Fixed pscleaner method 2013-07-30 09:21:41 +02:00
Kevin Granger b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Gregory Roussac b004151695 Merge pull request #599 from PrestaShop/master 
[*] CORE : Update gitignore
 2013-07-29 10:19:55 -07:00
Kevin Granger d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
gRoussac 918ceb3ed5 // norms 2013-07-29 19:15:47 +02:00
Gregory Roussac a23a576d47 Merge pull request #611 from 202-ecommerce/fix_translation 
[-] BO : Fix while of translation, to find in folder if translation exists
 2013-07-29 10:07:50 -07:00
Guillaume DELOINCE 8ddd592da1 [-] BO : Fix while of translation, to find in folder if translation exists 2013-07-29 19:00:57 +02: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
Jérôme Nadaud 39a6d0a42d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:18 +02:00
Vincent Augagneur db98509443 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:01 +02:00
Jérôme Nadaud 0ecc2fb0a0 [-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack 2013-07-29 18:36:55 +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
Gregory Roussac 5f791dc839 Merge pull request #541 from indesign47/patch-4 
[-] MO : products comments impossible if quantity > 0
 2013-07-29 09:36:32 -07: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
Jérôme Nadaud 72dc8b943f [-] FO : FixBug #PSCFV-9961 Remove wishlists icon 2013-07-29 17:58:31 +02:00
Jérôme Nadaud aa9a6e66b8 [-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B 2013-07-29 17:44:14 +02:00
Gregory Roussac d356fe684a Merge pull request #608 from indesign47/patch-7 
[*] BO : skip the first line by default
 2013-07-29 08:23:32 -07: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
Gregory Roussac 44b9909d4f Merge pull request #607 from indesign47/patch-6 
[-] BO : doesn't match available_fields of AdminImportController
 2013-07-29 08:12:26 -07:00
indesign47 65287d71c3 [-] BO : doesn't match available_fields of AdminImportController 
- Correct wrong position of available_fields
- Add some of available_fields
 2013-07-29 17:10:57 +02:00
Kevin Granger 613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
Kevin Granger 483dbd7b53 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl
 2013-07-29 16:21:31 +02:00
Kevin Granger ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
Sarah Lorenzini b528b7b6fc // update shipping tab 2013-07-29 16:13:07 +02:00
Sarah Lorenzini 101d9283ae // update wizard 2013-07-29 15:12:50 +02:00
gRoussac ab0189a726 [-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects 2013-07-29 14:39:35 +02:00
sLorenzini 243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00