dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
889a2006ecc7e70f5076f75d200459c5bf64703c
PrestaShop/admin-dev/themes/default/template/controllers
T
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
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
addons_catalog
// Toolbar modifs
2013-10-08 18:42:07 +02:00
addresses
// Fields resizing
2013-10-25 11:25:13 +02:00
attachments
// Welcome 2013
2013-01-04 11:19:03 +01:00
attribute_generator
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
attributes
// Code cleaning and small fixes
2013-10-24 17:04:55 +02:00
attributes_groups
// Security
2013-09-18 10:43:58 +02:00
backup
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
carrier_wizard
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
carriers
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
cart_rules
// cart rules > conditions > product rules
2013-10-31 11:34:47 +01:00
carts
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
categories
// Some changes to integrate uploader helper
2013-10-25 14:20:42 +02:00
cms
// Modules page + Warning
2013-08-26 11:38:10 +02:00
cms_categories
// CMS select size in form
2013-09-24 13:09:22 +02:00
cms_content
// update preferences tab
2013-07-31 17:43:48 +02:00
countries
// UI fixs
2013-10-31 12:20:29 +01:00
customer_threads
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
customers
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
dashboard
// fixs UI
2013-10-29 17:32:57 +01:00
emails
// Toolbar modifs
2013-10-08 18:42:07 +02:00
employees
// Check if exist children opt. in employees
2013-10-23 14:49:22 +02:00
feature_value
// Welcome 2013
2013-01-04 11:19:03 +01:00
features
// Welcome 2013
2013-01-04 11:19:03 +01:00
geolocation
// Toolbar modifs
2013-10-08 18:42:07 +02:00
groups
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
home
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
images
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-22 10:07:03 +02:00
import
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
information
// fix informations
2013-10-17 18:43:15 +02:00
invoices
// fix menu, design, css
2013-09-06 16:25:01 +02:00
languages
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
localization
// localization
2013-09-13 12:18:27 +02:00
login
// fix login - (tabindex, loading, ellipsis)
2013-10-25 14:58:10 +02:00
logs
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
maintenance
// Maintenance bootstrap design
2013-09-26 09:37:38 +02:00
manufacturers
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
marketing/helpers/view
// Toolbar modifs
2013-10-08 18:42:07 +02:00
meta
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
modules
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
modules_positions
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
not_found
[-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable
2013-05-15 11:31:55 +02:00
order_preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
orders
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
outstanding
// Welcome 2013
2013-01-04 11:19:03 +01:00
payment
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
performance
// UI fixs
2013-10-31 15:49:57 +01:00
preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
products
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
referrers
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
request_sql
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
return
// update order tab
2013-07-26 12:15:23 +02:00
scenes
// Security
2013-09-18 10:43:58 +02:00
search
[*] BO : search results improvements (no unaccessible tabs, better display, better information)
2013-10-25 15:19:03 +02:00
shop
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
shop_group
// Welcome 2013
2013-01-04 11:19:03 +01:00
shop_url
// Welcome 2013
2013-01-04 11:19:03 +01:00
slip
// update order tab
2013-07-26 12:15:23 +02:00
specific_price_rule
// UI fixs
2013-10-31 12:20:29 +01:00
states
// UI fixs
2013-10-31 12:20:29 +01:00
stats
// Fixed default selection in the stats submenu
2013-10-28 12:08:46 +01:00
statuses
// Remove flags from language select
2013-10-09 19:39:05 +02:00
stock_cover
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
stock_instant_state
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
stock_mvt
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
stores
// Some changes to integrate uploader helper
2013-10-25 14:20:42 +02:00
suppliers
//Suppliers view
2013-09-18 10:29:04 +02:00
supply_orders
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
supply_orders_change_state
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
supply_orders_receipt_history
// Welcome 2013
2013-01-04 11:19:03 +01:00
tags
[+] BO Scenes - Tags - Attachments
2013-07-26 11:12:50 +02:00
tax_rules
// oups
2013-10-29 18:15:17 +01:00
tax_rules_group
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
themes
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
tracking
[+] BO : Tracking page header toolbar
2013-08-27 18:22:54 +02:00
translations
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
warehouses
// replace fieldset with div for responsive table
2013-10-15 18:09:53 +02:00
webservice
// Webservice and advanced stock list bootstraping
2013-10-01 18:29:35 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00