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

17571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gRoussac
076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook 2013-07-26 17:15:36 +02:00
Jérôme Nadaud
5d2e19fe3b [-] BO : FixBug Impossible to remove available date from product attribute 2013-07-26 12:14:00 +02:00
Jérôme Nadaud
23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date 2013-07-26 11:48:18 +02:00
Damien Metzger
e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Gregory Roussac
30c689df22 Merge pull request #584 from Captain-FLAM/patch-3 
[-] FO : product with declinaisons without reductions, reduction price is showed anyway
 2013-07-26 00:58:00 -07:00
Gregory Roussac
5015f88a46 Merge pull request #595 from codl/fix/too-many-packs 
[-] WS: Sanity check before creating packs
 2013-07-26 00:51:08 -07:00
Gregory Roussac
7d06d50d40 Merge pull request #597 from Captain-FLAM/patch-9 
[-] CORE : Exception Text filled on Positions Page is not working (Hook Modules Exceptions)
 2013-07-26 00:38:22 -07:00
Captain FLAM
a35011e9a5 Update Module.php 2013-07-25 19:16:46 +01:00
Gregory Roussac
c9e87d99da Merge pull request #551 from cinscaen/development 
[-] BO: Fix Bug Progress Bar Upload Image Product
 2013-07-25 09:23:07 -07:00
Gregory Roussac
ceee011d5c Merge pull request #555 from piotrmocko/patch-1 
[- ] BO : Do not limit feature values on a  getList
 2013-07-25 09:20:53 -07:00
gRoussac
d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 2013-07-25 18:15:06 +02:00
gRoussac
9848468f3e [-] MO : blockviewed Fix bug adding last product to list, thanks @kluevandrew 2013-07-25 17:58:22 +02:00
Damien Metzger
e6ecf0c177 // Added a more efficient index 2013-07-25 17:07:28 +02:00
Damien Metzger
eff81dfe05 // Moved a condition/function from SQL to PHP. 2013-07-25 17:07:28 +02:00
Gregory Roussac
6531572c15 Merge pull request #596 from ChristopheBoucaut/patch-3 
[-) FO : addtextfield if magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST
 2013-07-25 07:36:31 -07:00
ChristopheBoucaut
a9e233b209 Update Cart.php 
If magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST as they already are.
 2013-07-25 15:46:08 +02:00
Gregory Roussac
a54ac39632 Merge pull request #356 from arnolem/dev-wsSetProductTags 
[*] WS : Allow to set the tags list of product
 2013-07-25 06:17:15 -07:00
Gregory Roussac
3896453c7c Merge pull request #352 from sdevilcry/development 
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
 2013-07-25 06:11:51 -07:00
gRoussac
bff2844adf [*] MO : Added customer and product object to hook sending email 2013-07-25 14:50:35 +02:00
Corentin Delcourt
53526304a5 [-] WS: Sanity check before creating packs 
As it is before this commit, every product that is created from the
schema without removing the empty bundle item in the schema will become
a pack containing one broken item.

Sorry, this bug was introduced by my previous pull request.
 2013-07-25 14:45:17 +02:00
Gregory Roussac
b4d3b631ad Merge pull request #594 from Shagshag/patch-6 
[*] BO: twice class attribute in color input
 2013-07-25 05:18:41 -07:00
gRoussac
ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages 2013-07-25 12:26:57 +02:00
Gregory Roussac
56aa91a3fa Merge pull request #296 from samy-r/dev-address-update 
[*] CORE : Add mobile phone in default adress layout update
 2013-07-25 03:05:36 -07:00
gRoussac
2e7f3c296b [-] FO : Force browser language detection in Tools::setCookieLanguage 2013-07-25 11:44:45 +02:00
Shagshag
21cf113c44 twice class attribute in color input 2013-07-25 10:26:53 +02:00
Gregory Roussac
5ee247ad23 Merge pull request #592 from Captain-FLAM/patch-8 
[*] MO : blocklayered : Supress unsuseful # at the end of URLs
 2013-07-25 01:23:46 -07:00
Jérôme Nadaud
cfeaf0fa36 // norm 2013-07-25 08:51:22 +02:00
Jérôme Nadaud
7b980217b5 // norm 2013-07-25 08:49:40 +02:00
Jérôme Nadaud
541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present 2013-07-24 19:24:22 +02:00
Gregory Roussac
ef22b9d5d4 Merge pull request #162 from bumbu/patch-2 
[-] CORE : updateMultishopTable() where argument is not mandatory anymore
 2013-07-24 10:07:56 -07:00
Jérôme Nadaud
ae7f47a275 [-] BO : FixBug #PSCFV-9042 Supply orders now accept 0 value to automatically load products 2013-07-24 18:52:47 +02:00
gRoussac
aaaa5cb086 [-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593 2013-07-24 18:22:04 +02:00
gRoussac
a406778e17 // norm 2013-07-24 17:32:58 +02:00