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

18398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 2a475d066f Merge pull request #803 from ldecoker/patch-8 
[-] BO : Missing $php_self variable in OrderDetailController.php
 2013-10-07 01:00:42 -07:00
Rémi Gaillard 3477cac1e0 Merge pull request #800 from Ha99y/20131004_retro-compat.js.php 
__DIR__ is available since PHP 5.3
 2013-10-07 00:35:02 -07:00
ldecoker 148348855e Update OrderDetailController.php 
Missing $php_self variable
 2013-10-06 16:31:54 +02:00
ha99y 98aea24fc3 __DIR__ was never defined 
The JS files would not lode, when in dev mode because __DIR__ was not
defined
 2013-10-04 17:18:23 -07:00
Fabio Chelly 48f20a4393 Merge remote-tracking branch 'origin/development' into development 2013-10-04 18:15:32 +02:00
Fabio Chelly 139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly 2013-10-04 18:15:12 +02:00
Jerome Nadaud 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
Jerome Nadaud 6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00
Gregory Roussac cfd70bf660 Merge pull request #789 from PhpMadman/patch-2 
[*] BO: wrong description on getIdOrderCarrier
 2013-10-03 07:30:14 -07:00
PhpMadman e38d808a85 [*] BO: wrong description on getIdOrderCarrier 2013-10-03 15:51:27 +02:00
Gregory Roussac 86631202df Merge pull request #788 from PhpMadman/patch-1 
[*] BO: missing align on order for product warehouse
 2013-10-03 06:37:58 -07:00
Fabio Chelly d601844e82 Merge remote-tracking branch 'origin/development' into development 2013-10-03 15:32:27 +02:00
Fabio Chelly ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
PhpMadman f979cbef57 [*] BO: missing align on order for product warehouse 2013-10-03 15:26:09 +02:00
Gregory Roussac 8762c310b9 Merge pull request #787 from tucoinfo/development 
[*] FO : add variable $nofollow to mobile theme header.tpl
 2013-10-03 05:02:01 -07:00
tucoinfo 8f09d49ffc [*] FO : add variable $nofollow to mobile theme header.tpl 
Copied from normal theme which already manages the NoFollow variable
 2013-10-03 12:19:10 +02:00
gRoussac 6610bd2067 [-] BO : Could noty save ImportMatchs 2013-10-03 11:15:03 +02:00
Jerome Nadaud 43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses 2013-10-03 11:06:08 +02:00
Gregory Roussac 4bb4199f5a Merge pull request #783 from ellisium/upper 
[-] CORE : CART::BOTH should be Cart::Both
 2013-10-02 07:34:00 -07:00
Eric Le Lay 3e0c5e71f4 classname uppercase issue 2013-10-02 16:28:45 +02:00
Damien Metzger 6974a88b59 Merge pull request #782 from 202-ecommerce/development 
[*] FO : Added new Maintenance Hook
 2013-10-02 06:07:42 -07:00
Rémi Gaillard f4cadbdfd6 Merge pull request #770 from urecheatu007/development 
[-] LO: updated localization pack for Romania / romanian - added states
 2013-10-02 05:47:17 -07:00
thoma202 1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development 2013-10-02 14:38:44 +02:00
thoma202 eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00
Rémi Gaillard 99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
gRoussac f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 16:17:23 +02:00
gRoussac 626ccf0985 [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 14:46:40 +02:00
Gregory Roussac a76a7273ea Merge pull request #776 from kpodemski/patch-5 
[*] FO: We let style selected category in CSS on blockcategories
 2013-10-01 03:04:54 -07:00
Krystian Podemski 9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories 
It's good to have this by default.
 2013-10-01 12:02:19 +02:00
gRoussac f30bc80485 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-01 10:48:17 +02:00
Jerome Nadaud 340f6cebe4 [-] FO : FixBug #PSCFV-10542 - Category description view problem 2013-10-01 10:20:33 +02:00
Jerome Nadaud 452e07ab0b [-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions 2013-09-30 19:26:49 +02:00
Jerome Nadaud 1b9472cc37 [-] BO : FixBug #PSCFV-10291 - Remove temporary image on install 2013-09-30 19:01:11 +02:00
Jerome Nadaud b7ff8d634a [-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position. 2013-09-30 17:23:12 +02:00
Jerome Nadaud f983e0eaf1 [-] BO : FixBug #PSCFV-10380 - Missing lang file existence verification. 2013-09-30 16:25:58 +02:00
Jerome Nadaud 6bb1fa6a4d // Missing '?' on regex 2013-09-30 14:59:27 +02:00
Jerome Nadaud 05eafdb14f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-30 14:57:46 +02:00
Jerome Nadaud cfc41ec4ef [+] BO : Add remove module override on constant - PSCFV-10430 2013-09-30 14:57:30 +02:00
Gregory Roussac 6822373378 Merge pull request #772 from codeurWeb/patch-5 
[*] FO : add GET pre-selection of id_contact in contact-form.tpl
 2013-09-30 05:56:09 -07:00
Julien dd5cd33bb4 [-] BO : fix pre-selection of id_contact in contact-form.tpl 2013-09-30 14:38:06 +02:00
Cosmin Hutanu 7eddca6d15 update localization pack for romania - added states 2013-09-30 13:06:19 +03:00
Cosmin Hutanu f9ad0d1b79 Merge pull request #3 from PrestaShop/development 
update from prestashop/development
 2013-09-30 02:47:52 -07:00
Jerome Nadaud e040c096d1 [-] BO : Remove customers group view list link 2013-09-30 10:34:54 +02:00
Gregory Roussac 3e85622972 Merge pull request #767 from enumag/patch-3 
[-] BO : Fix #PSCFV-10520 id_attribute_group can not be null
 2013-09-30 00:47:12 -07:00
Jáchym Toušek 5ebc2e5e91 [-] BO : Fix #PSCFV-10520 2013-09-29 14:43:14 +02:00
Jerome Nadaud c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00
Gregory Roussac 40617c0a81 Merge pull request #761 from nuzelac/patch-1 
[-] BO : fix multilingual field validity in AdminProductsController
 2013-09-27 09:50:03 -07:00
Nino Uzelac ca01b58262 fix multilingual field validity in AdminProductsController 2013-09-27 18:22:07 +02:00
Fabio Chelly 9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors 2013-09-27 16:08:00 +02:00
Jerome Nadaud 6449ecfb32 [-] BO : Force invoice footer text to 1 ligne 2013-09-27 14:41:50 +02:00