dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

6559 Commits

Author SHA1 Message Date
Francois Gaillard
58b5028147 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:25:57 +02:00
Francois Gaillard
176c6a8767 [-] Classes : ModuleFrontController updated. Thank you @codeurWeb 2013-08-05 16:25:52 +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
Rémi Gaillard
3317ab878d [-] WS: add id_address_delivery on cart products association 2013-08-05 15:53:40 +02:00
Francois Gaillard
db951f5b76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 15:37:20 +02:00
Francois Gaillard
f217061e27 [-] Classes : ModuleFrontController & templates overrides fixed 2013-08-05 15:37:16 +02:00
gRoussac
ed887fd5c3 [*] BO : Add filter choices in title of List, thankx to @ccauw 2013-08-05 15:18:42 +02:00
gRoussac
2ea0dc7749 [*] CORE : Allow external css loading, manual merge of https://github.com/PrestaShop/PrestaShop/pull/406 thanks @m-hume 2013-08-05 14:26:07 +02:00
Gregory Roussac
d1631e6920 Merge pull request #405 from ottonascarella/patch-1 
[*] CORE : Enable Progressive JPG
 2013-08-05 05:08:10 -07:00
inem0o
2de866eff3 Correct assignation of $order_way parameter 2013-08-05 12:21:19 +02:00
jeromenadaud
9ff0d60158 [-] BO : FixBug #PSCFV-7839 No invoice file attached to payment email confirmation 2013-08-05 09:41:46 +02:00
gRoussac
33116dfa47 [-] FO : Fix bug #PSCFV-9856 could not add Uncombinable cart rules and Minimum amount check badly calculated 2013-08-02 18:00:10 +02:00
Francois Gaillard
268b3c6bda // Variables name fixed 2013-08-01 19:14:04 +02:00
Francois Gaillard
b51d4f4c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 19:11:27 +02:00
Francois Gaillard
28de7890d2 [*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook) 2013-08-01 19:10:25 +02:00
jeromenadaud
d8f5caee7b [-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation 2013-08-01 19:09:34 +02:00
Francois Gaillard
07ce127723 [-] Classes : Bug fix Validate.php - Error with $mail_name 2013-08-01 17:31:45 +02:00
gRoussac
6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper 2013-08-01 16:15:41 +02:00
gRoussac
1028c8671c [-] CORE : Merge from PrestaEdit last pull request again 2013-08-01 16:12:05 +02:00
gRoussac
c9bb88cac7 // harmonisation within Tools:: instead self:: 2013-08-01 14:52:29 +02:00
PrestaEdit
37cd2a3ab3 [*] Class: Tools / toCamelCase 
Change the name of the var to a correct name.

Use the Tools method like strtolower, ucfirst and strtoupper.
 2013-08-01 14:42:51 +02:00
Damien Metzger
168759a383 // Stock performance optimization 2013-07-31 18:46:45 +02:00
Damien Metzger
e930d40482 // Added debug function Tools::debug_backtrace() 2013-07-31 18:46:45 +02:00
jeromenadaud
e1b7470845 [-] BO : FixBug Install currency on Localization Pack 2013-07-31 09:38:10 +02:00
Damien Metzger
e0f1041070 // Performance improvements for the cart page 2013-07-30 19:16:05 +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
3d40814739 //added name in errors array in validateRules 2013-07-30 11:33:30 +02:00
Vincent Augagneur
5929727be1 Merge pull request #601 from PrestaEdit/carrier_wizard2 
[-] Carrier Wizard: fix
 2013-07-30 02:22:45 -07: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
39a6d0a42d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:18 +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
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
Xavier
4291b23e23 Update CartRule.php 
Removed "502" from the notice of license.
 2013-07-29 11:41:35 +02:00
gRoussac
1c37fdbc23 // foloww up 2e6e5a2604 2013-07-29 10:24:36 +02: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
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
076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook 2013-07-26 17:15:36 +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
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
Captain FLAM
a35011e9a5 Update Module.php 2013-07-25 19:16:46 +01:00
Damien Metzger
eff81dfe05 // Moved a condition/function from SQL to PHP. 2013-07-25 17:07:28 +02: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
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