dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,046 Commits 9 Branches 19 Tags
c07f226dd4e58a4e7fc8af4d04241a6767953fe6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 1e10dab8f8 Merge pull request #646 from kpodemski/patch-2 
[*] CORE : Get instance of current category in category controller
 2013-08-13 05:54:40 -07:00
gRoussac 5d0f1499ac // without hedgehogs is better 2013-08-12 16:50:14 +02:00
gRoussac 30d9ebe68f [-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif 2013-08-12 16:44:25 +02:00
gRoussac 7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski 2013-08-12 16:23:54 +02:00
Gregory Roussac b7232aabd7 Merge pull request #643 from Shagshag/patch-2 
[*] BO :ProductDownload::getNewFilename() avoid recursion
 2013-08-12 00:29:33 -07:00
Gregory Roussac 49b6fda40f Merge pull request #639 from PrestaEdit/patch-49 
[-] BO: correct link in Block Discover.
 2013-08-08 03:09:29 -07:00
Gregory Roussac bb45c93d4f Merge pull request #563 from Prestaworks/patch-12 
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
 2013-08-08 02:00:57 -07:00
Gregory Roussac de3b121b11 Merge pull request #507 from jeckyl/patch-3 
[*] BO : Fix size for modules logo AdminModulesPositions
 2013-08-07 07:04:13 -07:00
Gregory Roussac 942a946147 Merge pull request #497 from romainberger/development 
[*] MO: Referral program: display currency in account page next to the voucher value
 2013-08-07 05:59:29 -07:00
Gregory Roussac 3213b5dffb Merge pull request #635 from cippest/development 
[-] BO : missing order lang in Mail::l for in_transit email
 2013-08-06 11:23:19 -07:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Gregory Roussac b1ea66d510 Merge pull request #528 from ldecoker/patch-7 
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
 2013-08-06 09:57:36 -07:00
Gregory Roussac bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
gRoussac 4bd59c14cc [*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve 2013-08-06 15:21:46 +02:00
gRoussac a739117f0d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:20:07 +02:00
gRoussac 8103e89874 [*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve 2013-08-06 15:19:47 +02:00
Gregory Roussac a0ee3d3c34 Merge pull request #633 from Seynaeve/patch-1 
[*] FO : Allow B2B to navigate through the form with Tab betwwen company and VAT field
 2013-08-06 06:17:06 -07:00
gRoussac dbb2b50555 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl 2013-08-06 15:15:03 +02:00
gRoussac c966eea140 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:11:46 +02:00
gRoussac c9bf17f400 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:09:38 +02:00
Gregory Roussac 12a3ef3a12 Merge pull request #486 from PhpMadman/patch-1 
[-] FO : In stock sort is now removed when Stock managment is disabled
 2013-08-06 15:08:55 +02:00
Gregory Roussac ba69e48f72 Merge pull request #488 from camlafit/pr-countriesbrowser 
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
 2013-08-06 03:07:13 -07:00
Gregory Roussac 818e82c09c Merge pull request #486 from PhpMadman/patch-1 
[-] FO : In stock sort is now removed when Stock managment is disabled
 2013-08-06 02:49:48 -07:00
gRoussac fe0afeadc9 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu 2013-08-06 11:45:29 +02:00
gRoussac 6449437f58 // norms 2013-08-06 11:38:34 +02:00
gRoussac 084880abda Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 11:38:24 +02:00
gRoussac 16d942b7b6 [*] BO : Do not insert duplicates in product_carrier, thanks @edamart 2013-08-06 11:22:40 +02:00
gRoussac 81e4a5f635 [*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart 2013-08-06 11:19:34 +02:00
Gregory Roussac 1b93d251aa Merge pull request #630 from rimas-kudelis/development 
[*] CORE :ProductCore::addSupplierReference() if a reference already exists  update it
 2013-08-06 01:51:34 -07:00
gRoussac edfe77b74f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 10:43:14 +02:00
gRoussac a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
 2013-08-06 10:42:44 +02:00
Gregory Roussac 77ba55b090 Merge pull request #629 from ChristopheBoucaut/patch-4 
[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
 2013-08-06 01:30:46 -07:00
Gregory Roussac 23b9c3b8f9 Merge pull request #627 from davyrolink/upstream 
[*] CORE : add $smarty to params in smartyHook function
 2013-08-06 01:10:41 -07:00
Gregory Roussac 5f0ef76731 Merge pull request #626 from davyrolink/upstream 
[-] CORE : id_address_invoice was not updated, updateAddressId method
 2013-08-05 14:13:54 -07:00
gRoussac adceb5ccf5 [-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey 2013-08-05 19:16:44 +02:00
Gregory Roussac 9f13b9f7b1 Merge pull request #474 from madef/master 
[*] Project : Add paging to Collections
 2013-08-05 09:52:16 -07:00
gRoussac d585b015c1 // move toolbar delete button on AdminProducts 2013-08-05 18:18:35 +02:00
Gregory Roussac 931cfee258 Merge pull request #625 from axometeam/patch-18 
[-] MO : All fields available in the RSS
 2013-08-05 09:06:02 -07:00
gRoussac 9ca9928c58 [-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis 2013-08-05 17:17:22 +02:00
gRoussac 5cd75f23ff [-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis 2013-08-05 17:05:07 +02:00
gRoussac a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
Gregory Roussac 07181a37f5 Merge pull request #413 from ccauw/patch-9 
[-] BO : bug color parameter in List
 2013-08-05 06:37:46 -07: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
Gregory Roussac b8e5ad0e44 Merge pull request #624 from iNem0o/development 
[-] FO : getBestSales() $order_way doesnt  work in DESC mode
 2013-08-05 04:58:39 -07:00
gRoussac 13b3adb8c0 [-] INSTALLER : Force update of PS_LEGACY_IMAGES to 0 2013-08-05 12:17:21 +02:00
gRoussac 8c2af798a4 // small change on pack css 2013-08-05 12:01:40 +02:00
gRoussac 19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses 2013-08-05 10:47:04 +02:00
gRoussac 055134719d [-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392 2013-08-02 18:33:53 +02:00
Gregory Roussac 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07: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
gRoussac 6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper 2013-08-01 16:15:41 +02:00
gRoussac ccc2312053 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 16:12:19 +02:00
gRoussac 1028c8671c [-] CORE : Merge from PrestaEdit last pull request again 2013-08-01 16:12:05 +02:00
gRoussac 7fb483eaa2 // harmonisation within Tools:: instead self:: 2013-08-01 15:07:38 +02:00
gRoussac c9bb88cac7 // harmonisation within Tools:: instead self:: 2013-08-01 14:52:29 +02:00
Gregory Roussac 99ebde1e8e Merge pull request #622 from PrestaEdit/patch-48 
[*] CORE : toCamelCase should use utf8 Tools functions
 2013-08-01 05:48:49 -07:00
gRoussac fd7facc9b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 14:28:41 +02:00
gRoussac 8a9376ae22 [-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content 2013-08-01 14:28:36 +02:00
gRoussac 2b6b65a303 // norms 2013-08-01 14:27:50 +02:00
gRoussac 3e75881bdc Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 11:48:50 +02:00
gRoussac 184a1c561c [-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page 2013-08-01 11:44:00 +02:00
gRoussac c41537f4e4 [-] INSTALLER : missing parenthesis in SQL in set_product_suppliers, thanks to @EvaldasUzkuras 2013-07-31 16:08:54 +02:00
gRoussac e85ffae69d [-] INSTALLER : Fix bug while updateing supplier reference, back from https://github.com/PrestaShop/PrestaShop/pull/618 thanks @EvaldasUzkuras 2013-07-31 15:55:06 +02:00
gRoussac 5e0b5db23b [*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614 2013-07-31 15:16:42 +02:00
Gregory Roussac 304e479ca5 Merge pull request #617 from axometeam/patch-16 
[*] BO : Fix statistics redirection when change date
 2013-07-31 05:17:13 -07:00
Gregory Roussac b0ac617e9f Merge pull request #615 from nilsga/development 
[-] BO : Fixed fieldset issue when customer is a guest
 2013-07-31 05:15:13 -07:00
Gregory Roussac 6f27508972 Merge pull request #616 from sebastienhouzet/development 
[*] CORE : htaccess in override folder
 2013-07-31 05:11:41 -07:00
gRoussac f28a480bf9 // remove console.log 2013-07-30 20:36:38 +02:00
gRoussac f606cb4efb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 20:28:12 +02:00
gRoussac 6600112ab1 [-] BO : Fix onchange event on Adminmodules list execption 2013-07-30 20:28:06 +02:00
gRoussac 9ae8667783 [-] BO : Fix onchange event on adminmoudlue list execption 2013-07-30 20:26:45 +02:00
gRoussac 024800d4f9 // w3c multiple 2013-07-30 20:04:45 +02:00
gRoussac edb8cce49f //norms 2013-07-30 19:57:23 +02:00
gRoussac 5677826b2f // wrong commit 2013-07-30 19:21:02 +02:00
gRoussac 0821194f94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-30 19:19:32 +02:00
gRoussac d6856a5c62 //norms 2013-07-30 19:18:29 +02:00
gRoussac d68d844303 // norms 2013-07-30 19:02:05 +02:00
Gregory Roussac 800c63036e Merge pull request #605 from Captain-FLAM/patch-10 
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
 2013-07-30 09:48:11 -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
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
Gregory Roussac 53c195e9d9 Merge pull request #610 from indesign47/patch-8 
[*] BO : shipping enlarge listbox carriers
 2013-07-29 09:38:59 -07: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
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
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
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
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
gRoussac 1c37fdbc23 // foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d 2013-07-29 10:24:36 +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
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
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