dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8dc29b20f052bc5ca1f5bf2d48e4a3fa35c6d8e7
PrestaShop/install-dev/data/xml
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
..
access.xml
//added dashboard controller
2013-08-28 10:04:28 +02:00
address_format.xml
[*] CORE: Add phone_mobile to address format
2013-10-08 11:11:24 +02:00
carrier_group.xml
// Default carrier groups updated
2013-03-25 12:13:53 +01:00
carrier_tax_rules_group_shop.xml
// Fix tax_rules_group install on carriers and products
2012-02-24 09:41:31 +00:00
carrier_zone.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
carrier.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
category_group.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
category.xml
// Fix position for category_product in installer
2012-04-17 16:46:26 +00:00
cms_category.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
cms.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
configuration.xml
// Fixed default stats graph engine
2013-10-28 12:15:35 +01:00
contact.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
country.xml
[-] Installer : changed Guam zone #PSCFV-3134
2012-07-11 08:01:08 +00:00
delivery.xml
// MERGE product_multistore branch : product fields are now editable per shop
2012-04-17 13:32:12 +00:00
gender.xml
[*] LO : Removed 'Miss' from the default genders because too country specific
2013-10-07 07:53:19 +00:00
group.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
hook_alias.xml
[-] INSTALLER : Add hook alias - #PSCFV-2742
2012-07-02 08:59:09 +00:00
hook.xml
// Categories thumbnails
2013-10-22 17:43:10 +02:00
image_type.xml
// Image sizes
2013-10-31 17:41:02 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
meta.xml
// Order confirmation meta data installation fixed
2013-02-25 10:05:40 +01:00
operating_system.xml
// Browsers and OS updated
2012-09-28 15:09:10 +00:00
order_return_state.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
order_state.xml
[-] CORE : order state preparation now generate delivery slip
2013-02-05 10:15:53 +01:00
profile.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
quick_access.xml
// Colored switch, removed "required field" legend, removed duplicate links quick access
2013-09-04 18:14:11 +02:00
risk.xml
// Fixed typo #PSCFV-2995
2012-07-03 07:43:31 +00:00
search_engine.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
state.xml
// Fixed ISO code of japanese todōfuken
2013-09-25 15:30:16 +02:00
stock_mvt_reason.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
supply_order_state.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
tab.xml
// Fixed tabs
2013-10-11 12:10:24 +02:00
theme.xml
[+] FO : New Responsive, Bootstrap template
2013-10-23 16:56:02 +02:00
timezone.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
warehouse.xml
// install-new renamed to install-dev
2012-01-26 17:35:54 +00:00
web_browser.xml
// Browsers and OS updated
2012-09-28 15:09:10 +00:00
zone.xml
[-] Installer : BugFix : #PSTEST-938 : spelling mistake fixed
2012-03-05 13:40:47 +00:00