dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
92bd59fbeadb5671cdfeccceeb9920f125b3597c
PrestaShop/classes
History
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
..
cache
// remove strict standard warning
2013-09-05 19:00:25 +02:00
controller
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
db
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
exception
// Added debug function Tools::debug_backtrace()
2013-07-31 18:46:45 +02:00
helper
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
log
[-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure.
2013-02-06 19:21:23 +01:00
module
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
order
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
pdf
[-] PDF : Report of 9c939ccead
2013-09-24 18:55:55 +02:00
range
// Welcome 2013
2013-01-04 11:19:03 +01:00
shop
[-] BO: fix the checkbox of shop activation on modules configuration
2013-10-30 14:57:15 +01:00
stock
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
tax
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
tree
// Security
2013-09-18 10:43:58 +02:00
webservice
[-] WS: Fix #PSCFV-10672 order by ID for non multishop entities
2013-10-11 17:53:15 +02:00
.htaccess
2011-07-06 10:54:11 +00:00
Address.php
// Performance improvements for the cart page
2013-07-30 19:16:05 +02:00
AddressFormat.php
[-] BO : Do not display country formatting twice, neither in FO
2013-01-25 12:13:13 +01:00
AdminTab.php
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
Alias.php
Update Alias.php
2013-10-14 19:20:38 +02:00
Attachment.php
[*] BO : you can know download the previous file near the upload file input
2013-10-25 18:55:25 +02:00
Attribute.php
[-] BO : Fix #PSCFV-10520
2013-09-29 14:43:14 +02:00
AttributeGroup.php
// small fix
2013-08-21 18:24:10 +02:00
Autoload.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
Backup.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Blowfish.php
[*] Installer : added cookie mode instead of session for the installer
2013-06-13 15:28:16 +02:00
Carrier.php
// New profitability calculation
2013-10-22 11:39:57 +02:00
Cart.php
Update Cart.php
2013-10-16 10:14:14 +08:00
CartRule.php
[-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart
2013-10-28 19:00:00 +01:00
Category.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
Chart.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
CMS.php
[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski
2013-10-29 19:05:21 +01:00
CMSCategory.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Collection.php
Keep retro-compatibility
2013-06-03 13:28:51 +02:00
Combination.php
// add check stock value for color list if needed
2013-10-11 14:11:12 +02:00
CompareProduct.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Configuration.php
// Fixed typo and configuration parse error
2013-09-25 20:21:41 +02:00
ConfigurationKPI.php
[+] BO : Added new class ConfigurationKPI for KPI cache storage
2013-09-18 15:09:04 +02:00
ConfigurationTest.php
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
Connection.php
Update Connection.php correction from 717
2013-09-13 11:56:50 +02:00
ConnectionsSource.php
[-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded
2013-05-28 10:29:51 +02:00
Contact.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Context.php
[+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order
2013-02-28 15:23:21 +01:00
ControllerFactory.php
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
Cookie.php
[-] FO : Force browser language detection in Tools::setCookieLanguage
2013-07-25 11:44:45 +02:00
Country.php
// Missing }
2013-07-23 09:52:41 +02:00
County.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
CSV.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Currency.php
[-] CORE : Currency conversion rate can not be 0
2013-10-29 15:39:17 +01:00
Customer.php
[-] BO: Fix empty group list on changing opt or newsletter on customers listing
2013-10-31 11:22:40 +01:00
CustomerMessage.php
[-] FO : CustomerMessage ip_address to string
2013-10-29 11:18:53 +01:00
CustomerThread.php
[-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion
2013-05-31 17:39:34 +02:00
Customization.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
DateRange.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Delivery.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Discount.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Dispatcher.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
Employee.php
// employee avatar
2013-10-30 18:02:10 +01:00
Feature.php
[-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors
2013-10-25 17:01:28 +02:00
FeatureValue.php
// definition on addFeatureValueImport
2013-10-23 01:23:35 +02:00
FileUploader.php
[-] BO : Fix bug #10689, could not set image legend in back office
2013-10-27 22:49:25 +01:00
Gender.php
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
Group.php
// forgot to commit in f78cde96d6
2013-10-30 19:02:24 +01:00
GroupReduction.php
// Fix group reduction per category
2013-10-04 14:00:42 +02:00
Guest.php
[+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order
2013-02-28 15:23:21 +01:00
HelpAccess.php
// use curl against file_get_contents if allow_url_fopen is disabled for contextual help
2013-02-06 16:36:07 +01:00
Hook.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
Image.php
[-] BO : Fix bug #10689, could not set image legend in back office
2013-10-27 22:49:25 +01:00
ImageManager.php
// Add regenerate option to thumbnail creation
2013-10-24 18:52:10 +02:00
ImageType.php
[*] BO : AdminProducts find smallest images
2013-10-29 08:47:41 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Language.php
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
Link.php
// small fix for SSL
2013-09-18 17:19:03 +02:00
LocalizationPack.php
[*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import
2013-10-23 18:22:53 +02:00
Logger.php
// type of logger field
2013-10-29 10:18:29 +01:00
Mail.php
[-] BO : FixBug - Remove second email in recipient
2013-10-10 15:04:32 +02:00
Manufacturer.php
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
Media.php
// manually merge of modules search
2013-10-16 11:36:40 +02:00
Message.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Meta.php
Update Meta.php
2013-10-14 09:53:50 +02:00
Notification.php
// Removed deprecated function
2013-09-25 14:05:16 +02:00
ObjectModel.php
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
2013-10-24 16:30:02 +02:00
Pack.php
[-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images
2013-03-20 20:12:28 +01:00
Page.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
PaymentCC.php
// small fix
2013-02-21 15:24:33 +01:00
PaymentModule.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
Product.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
ProductDownload.php
ProductDownload::getNewFilename() little optimisation
2013-08-12 04:28:58 +02:00
ProductSale.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
ProductSupplier.php
[-] BO: product supplier price should not be converted on product page #PSCFV-9420
2013-07-02 15:45:12 +02:00
Profile.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
QuickAccess.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Referrer.php
[-] MO : Trackingfront, could not load employee stats date
2013-10-12 23:24:32 +02:00
RequestSql.php
[*] BO : Correct Request Sql Manager validate options
2013-06-25 11:01:01 +03:00
Rijndael.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Risk.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Scene.php
[-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scene
2013-06-24 14:50:10 +02:00
Search.php
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
SearchEngine.php
[-] CORE : Report of a6e8a2eda7
2013-05-27 18:13:13 +02:00
SpecificPrice.php
[-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0
2013-10-15 10:30:48 +02:00
SpecificPriceRule.php
[-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule
2013-10-04 14:11:42 +02:00
State.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Store.php
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +02:00
Supplier.php
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
Tab.php
// Code cleaning
2013-10-21 18:18:48 +02:00
Tag.php
// parse error
2013-09-24 15:44:56 +02:00
Theme.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Tools.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
Translate.php
Update Translate.php
2013-07-12 15:17:09 +02:00
TranslatedConfiguration.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Upgrader.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Uploader.php
//Starting Uploader helper
2013-10-25 14:19:51 +02:00
Validate.php
[*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import
2013-10-23 18:22:53 +02:00
Zone.php
// Welcome 2013
2013-01-04 11:19:03 +01:00