dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
312ad4eb37da25937b2db96fdfa5e2e9c14bbfd2
PrestaShop/classes
History
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
2013-07-24 17:01:23 +02:00
..
cache
[-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab
2013-07-11 18:27:54 +02:00
controller
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
db
// removed deprecated message
2013-07-17 13:42:45 +02:00
exception
// small fix
2013-03-04 10:40:36 +01:00
helper
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +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
// Blind fix
2013-07-19 16:29:17 +02:00
order
// Fixed fix
2013-07-23 14:19:13 +02:00
pdf
Merge pull request #560 from BigZ/patch-4
2013-07-12 08:42:16 -07:00
range
// Welcome 2013
2013-01-04 11:19:03 +01:00
shop
// Fixed getMainShopDomain
2013-07-23 11:33:07 +02:00
stock
[-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement
2013-07-22 14:58:55 +02:00
tax
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
webservice
[-] WS: do not escape shop name overzealously
2013-07-10 10:21:33 +02:00
.htaccess
2011-07-06 10:54:11 +00:00
Address.php
[-] MO : do not check the VAT number if the module is disabled #PSCFV-9397
2013-06-13 16:34:34 +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 : remove deprecated parameter when call Tools::displayDate()
2013-05-20 16:55:52 +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
// same for attributes and attributegroups
2013-05-27 18:13:13 +02:00
Autoload.php
[*] CORE: can not delete class_index.php
2013-06-23 19:53:28 +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
[-] Fix #PSCFV-9038 carrier warehouse association after carrier edition
2013-07-23 11:57:44 +02:00
Cart.php
[*] FO : removed code specific to multishipping from the no-multishipping process
2013-07-08 11:21:50 +02:00
CartRule.php
[-] FO : fixed group query for cart rules #PSCFV-8992
2013-07-18 13:47:43 +02:00
Category.php
// Moved useless code into the block where it is useful
2013-07-22 10:49:41 +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
Fix Collection->sqlGroupBy()
2013-01-04 14:28:49 +01:00
Combination.php
[-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query
2013-07-15 11:00:35 +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
// something was missing on the last commit
2013-03-29 15:53:26 +01:00
Connection.php
[*] FO : a few more SQL improvements
2013-07-19 11:29:18 +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
[*] Installer : added cookie mode instead of session for the installer
2013-06-13 15:28:16 +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
[*] Core: that is now easier to get links for another shop
2013-07-11 16:40:40 +02:00
Employee.php
// Small backend optimization
2013-07-23 09:50:26 +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
Update Hook.php
2013-07-22 21:35:20 +01:00
Image.php
//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit
2013-02-05 14:16:47 +01: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 : translation copy is now easier #PSCFV-8886
2013-07-18 18:51:37 +02:00
Link.php
[*] FO : getCatImageLink doesn't work without type thanks @axometeam
2013-07-12 15:03:52 +02:00
LocalizationPack.php
[*] BO : attributes taken into account for the language entity in the localization packs
2013-06-06 18:53:51 +02:00
Logger.php
[+] BO: Addition, deletion and edition are now logged
2013-07-11 14:50:23 +02:00
Mail.php
[-] Classes : Mail - check instance of link in the context
2013-07-11 14:01:24 +02:00
Manufacturer.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:33:51 +02:00
Media.php
Merge pull request #572 from PrestaEdit/patch-47
2013-07-15 07:41:07 -07:00
Message.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Meta.php
[-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection()
2013-05-17 17:56:42 +02:00
Notification.php
[-] BO: Fix SQL error on click on notification if no new notifications
2013-03-06 12:05:34 +01:00
ObjectModel.php
[*] FO : lots of performance improvements (removed or merged useless SQL queries)
2013-07-19 10:58:51 +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
[-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216
2013-07-18 12:09:48 +02:00
Product.php
[-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl
2013-07-23 18:36:51 +02:00
ProductDownload.php
[-] BO : Remove warning on ProductDownload
2013-04-02 10:31:01 +02:00
ProductSale.php
[-] FO : fixed bug #PSCFV-9007 - Best sales query has ambigious column when sorted on date_add
2013-06-24 11:43:20 +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
Update Search.php
2013-07-23 09:36:08 +02:00
SearchEngine.php
[-] CORE : Report of a6e8a2eda7
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
[-] FO : FixBug of total products from supliers and manufacturer
2013-07-18 18:33:35 +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-07-24 17:01:23 +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 branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:31:35 +02:00
Zone.php
// Welcome 2013
2013-01-04 11:19:03 +01:00