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

17609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Gregory Roussac
b004151695 Merge pull request #599 from PrestaShop/master 
[*] CORE : Update gitignore
 2013-07-29 10:19:55 -07: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
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
PrestaEdit
c1b0d32d32 [-] Carrier Wizard: fix 2013-07-29 13:57:31 +02:00
Damien Metzger
ad9d3af3ad // Class index for Carrier Wizard 2013-07-29 11:54:08 +02:00
Gregory Roussac
155102da4b Merge pull request #603 from xBorderie/patch-1 
// Removed "502" from the notice of license.
 2013-07-29 02:49:48 -07:00
Xavier
4291b23e23 Update CartRule.php 
Removed "502" from the notice of license.
 2013-07-29 11:41:35 +02:00
Vincent Augagneur
e1b408f1f3 //added missing carrier wizard step img 2013-07-29 11:36:44 +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
gRoussac
1c37fdbc23 // foloww up 2e6e5a2604 2013-07-29 10:24:36 +02:00
Vincent Augagneur
60d67a7798 Merge pull request #600 from PrestaEdit/carrier_wizard 
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
 2013-07-29 01:04:17 -07:00
Jérôme Nadaud
95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
PrestaEdit
c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" 2013-07-27 15:23:48 +02:00
PrestaEdit
85553525e9 Merge pull request #2 from PrestaShop/development 
// Merge PrestaShop
 2013-07-27 04:39:15 -07:00
Rémi Gaillard
a786606c9a // small fix on carrierwizard 2013-07-26 20:27:25 +02:00
Rémi Gaillard
77f4eec64f // Fix group association on carrierwizard 2013-07-26 19:38:06 +02:00
Rémi Gaillard
159d0b3904 // improve exception 2013-07-26 19:15:37 +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
gRoussac
42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus 2013-07-26 17:55:53 +02:00
gRoussac
2704f52fe4 [-] Installer: update leftcolumn alias to enable live_edit on blockmyaccount 2013-07-26 17:20:52 +02:00