dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6d3a15ef5b28ac78e2fe7be7f668be23631efab3
PrestaShop/classes
T
History
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
2013-10-14 12:21:29 +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-10-14 12:21:29 +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-10-14 12:21:29 +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-10-14 12:21:29 +02:00
order
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
pdf
[-] PDF : Report of https://github.com/enumag/PrestaShop/commit/9c939cceadebd58ad390fb4f108816e3c17c0275
2013-09-24 18:55:55 +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
// add check stock value for color list if needed
2013-10-11 14:11:12 +02: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
// 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
[-] 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
// Fix class_index generation
2013-10-11 11:15:14 +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
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
CartRule.php
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02: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
[*] 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
// 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
// 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
[-] BO : Fix #PSCFV-10501 Remove fatal error
2013-09-25 18:02:06 +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
// Default tab is the dashboard
2013-09-25 18:08:56 +02:00
Employee.php
// Adding compare dates to date range picker
2013-10-11 18:30:05 +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
[-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot
2013-10-03 16:09:43 +02: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
[-] BO : AdminImport, fix Group searchByName
2013-10-11 10:23:17 +02: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-10-14 12:21:29 +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
// Fixed language code consistency
2013-09-27 10:25:37 +02:00
Link.php
// small fix for SSL
2013-09-18 17:19:03 +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
[-] 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
Added ui.button as dependency of ui.dialog
2013-09-13 08:02:47 -07: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
// Removed deprecated function
2013-09-25 14:05:16 +02:00
ObjectModel.php
// use ObjectModel::validateField on validaterules
2013-09-24 17:12:28 +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
[-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules
2013-10-01 18:11:54 +02:00
Product.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02: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-10-14 12:21:29 +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
[-] 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 https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f
2013-05-27 18:13:13 +02:00
SpecificPrice.php
[-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580
2013-10-04 18:37:30 +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
// Fixed tabs
2013-10-11 12:10:24 +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-10-14 12:21:29 +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