dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c7ec33f0622b83b305e59063fabfeb374cffaba0
PrestaShop/admin-dev/themes/default/template/controllers
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
..
access
// Fix Admin access
2013-09-12 15:55:14 +02:00
addons_catalog
// Welcome 2013
2013-01-04 11:19:03 +01:00
addresses
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-21 09:14:10 +02:00
attachments
// Welcome 2013
2013-01-04 11:19:03 +01:00
attribute_generator
[+] BO: Form components
2013-06-18 21:03:43 +02:00
attributes
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-21 09:14:10 +02:00
attributes_groups
// Welcome 2013
2013-01-04 11:19:03 +01:00
backup
// update backup BDD, import, and email pages
2013-09-05 14:55:07 +02:00
carrier_wizard
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
carriers
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
cart_rules
// Modules page + Warning
2013-08-26 11:38:10 +02:00
carts
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
categories
// Tree bugs
2013-09-12 15:22:47 +02:00
cms
// Modules page + Warning
2013-08-26 11:38:10 +02:00
cms_categories
// Welcome 2013
2013-01-04 11:19:03 +01:00
cms_content
// update preferences tab
2013-07-31 17:43:48 +02:00
countries
// update localization and modules tabs
2013-07-31 14:47:21 +02:00
customer_threads
// I'm not sure as I've never had a look at how that works before ;)
2013-07-31 21:17:03 +02:00
customers
// Modules page + Warning
2013-08-26 11:38:10 +02:00
dashboard/helpers/view
// dashboard panel version
2013-09-12 14:42:20 +02:00
emails
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
employees
// No escape in JS links
2013-06-07 12:33:44 +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
// Welcome 2013
2013-01-04 11:19:03 +01:00
groups
// Modules page + Warning
2013-08-26 11:38:10 +02:00
home
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
images
// Modules page + Warning
2013-08-26 11:38:10 +02:00
import
// update backup BDD, import, and email pages
2013-09-05 14:55:07 +02:00
information
// Modules page + Warning
2013-08-26 11:38:10 +02:00
invoices
// fix menu, design, css
2013-09-06 16:25:01 +02:00
languages
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
localization
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
login
// Modules page + Warning
2013-08-26 11:38:10 +02:00
logs
// fix, design and fun !
2013-08-06 19:06:56 +02:00
maintenance
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
manufacturers
no message
2013-07-25 19:18:54 +02:00
marketing/helpers/view
[+] BO : added new marketing tab
2013-02-13 09:57:30 +01:00
meta
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
modules
// fix modules list
2013-09-04 18:56:00 +02:00
modules_positions
// Modules position
2013-08-27 19:08:53 +02: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-09-13 11:41:14 +02:00
outstanding
// Welcome 2013
2013-01-04 11:19:03 +01:00
payment
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
performance
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
products
// Add count down to text input
2013-09-12 17:59:25 +02:00
referrers
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
request_sql
// fix, design and fun !
2013-08-06 19:06:56 +02:00
return
// update order tab
2013-07-26 12:15:23 +02:00
scenes
// Welcome 2013
2013-01-04 11:19:03 +01:00
search
// BO Bootstrap Search result page
2013-09-02 11:02:23 +02:00
shipping
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-21 09:14:10 +02:00
shop
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00: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
// small change on specific price rules after condition deletion
2013-08-21 19:14:59 +02:00
states
// update localization tab
2013-07-30 17:45:50 +02:00
stats
//added form date range picker on dashboard
2013-09-03 10:19:15 +02:00
statuses
[+] BO: Form components
2013-06-18 21:03:43 +02:00
stock_cover
// update stock tab
2013-08-05 12:13:43 +02:00
stock_instant_state
// Welcome 2013
2013-01-04 11:19:03 +01:00
stock_mvt
// Welcome 2013
2013-01-04 11:19:03 +01:00
stores
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
suppliers
// BO: Improve product display on supplier page
2013-04-30 11:09:08 +02:00
supply_orders
// fix, design and fun !
2013-08-06 19:06:56 +02:00
supply_orders_change_state
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01: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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
tax_rules_group
// Welcome 2013
2013-01-04 11:19:03 +01:00
themes
// fix, design and fun !
2013-08-06 19:06:56 +02:00
tracking
[+] BO : Tracking page header toolbar
2013-08-27 18:22:54 +02:00
translations
// Modules page + Warning
2013-08-26 11:38:10 +02:00
warehouses
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
webservice
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00