dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c7ec33f0622b83b305e59063fabfeb374cffaba0
PrestaShop/classes
T
History
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
2013-09-13 11:41:14 +02: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-09-13 11:41:14 +02:00
db
// removed deprecated message
2013-07-17 13:42:45 +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-09-13 11:41:14 +02: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-09-13 11:41:14 +02:00
order
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 15:10:06 +02:00
pdf
// Removed deprecated parameter
2013-08-20 14:48:58 +02:00
range
// Welcome 2013
2013-01-04 11:19:03 +01:00
shop
[-] Core: Set a remote addr with php-cli #PSCFV-10372
2013-09-11 16:40:33 +02:00
stock
[-] BO: Fix out of stock creation with multishop and stock sharing
2013-09-11 16:22:13 +02:00
tax
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
tree
// Tree
2013-09-12 14:47:47 +02:00
webservice
[-] WS: Fix entities retrieve for some cases
2013-09-11 16:32:11 +02:00
.htaccess
…
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
// Fixed code typo
2013-08-26 09:48:26 +02:00
Alias.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Attachment.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Attribute.php
// same for attributes and attributegroups
2013-05-27 18:13:13 +02:00
AttributeGroup.php
// small fix
2013-08-21 18:24:10 +02:00
Autoload.php
// Typo
2013-09-12 15:04:47 +02: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
//small fix #PSCFV-10194
2013-08-26 17:34:13 +02:00
Cart.php
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
CartRule.php
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02:00
Category.php
// Categories tree
2013-09-11 15:08:24 +02:00
Chart.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
CMS.php
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02: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
[-] BO : FixBug #PSCFV-10075 remove product attribute image association on delete product attribute
2013-08-20 17:05:48 +02:00
CompareProduct.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Configuration.php
// Fixed issue with configuration saving after a backup/update or anything linked to the usage of a mysql dump
2013-06-24 14:41:58 +02:00
ConfigurationTest.php
// foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d
2013-07-29 10:24:36 +02:00
Connection.php
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +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
// Welcome 2013
2013-01-04 11:19:03 +01: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
// Fixed references to a "conversion rate" that was in fact the "exchange rate"
2013-07-01 12:14:50 +02:00
Customer.php
[-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process
2013-01-31 19:06:19 +01:00
CustomerMessage.php
[-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion
2013-05-31 17:39:34 +02: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
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +02:00
Employee.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
Feature.php
[-] BO: Fix #PSCFV-9428 features duplicated with multishop on Feature::getFeatures()
2013-06-12 18:24:14 +02:00
FeatureValue.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
FileUploader.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Gender.php
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
Group.php
[*] FO : lots of performance improvements (removed or merged useless SQL queries)
2013-07-19 10:58:51 +02:00
GroupReduction.php
[-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction
2013-07-22 11:25:13 +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-09-13 11:41:14 +02:00
Image.php
[-] BO : ini_get('safe_mode') can return false
2013-09-08 22:26:21 +02:00
ImageManager.php
[-] BO : FixBug Directory Separator on URL
2013-07-18 08:52:39 +02:00
ImageType.php
//fixed bug with images when theme don't have associate image type
2013-01-23 09:30:49 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Language.php
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
Link.php
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
LocalizationPack.php
[-] BO : FixBug Install currency on Localization Pack
2013-07-31 09:38:10 +02:00
Logger.php
// Add a buton to erase all log
2013-09-05 15:58:36 +02:00
Mail.php
Add Bcc support in Mail class
2013-09-10 17:11:34 +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
[-] BO : fixed bug when try to add jquery from ajax.googleapis.com in BO
2013-08-26 16:31:50 +02:00
Message.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Meta.php
[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
2013-09-11 10:30:40 +02:00
Notification.php
[-] BO : fixed notifications when there is too much data
2013-09-10 09:17:54 +02:00
ObjectModel.php
// Fixed totally unexplicable behavior
2013-08-06 17:40:49 +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
[-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation
2013-08-01 19:09:34 +02:00
Product.php
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
2013-09-04 15:05:55 +02:00
ProductDownload.php
ProductDownload::getNewFilename() little optimisation
2013-08-12 04:28:58 +02:00
ProductSale.php
[-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept
2013-08-07 18:10:39 +02: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
// Welcome 2013
2013-01-04 11:19:03 +01: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 https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f
2013-05-27 18:13:13 +02:00
SpecificPrice.php
[-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query
2013-07-15 11:00:35 +02:00
SpecificPriceRule.php
[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
2013-04-18 14:21:44 +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
// Small backend optimization
2013-07-23 09:50:26 +02:00
Tag.php
// Welcome 2013
2013-01-04 11:19:03 +01: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-09-13 11:41:14 +02: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
Validate.php
//MERGE branche release
2013-08-26 10:59:36 +02:00
Zone.php
// Welcome 2013
2013-01-04 11:19:03 +01:00