dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4da04275fe8cbb7e2e98bf0ceb2a6384d52c4c40
PrestaShop/admin-dev/themes/default/template/controllers
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
..
access
// Permission bootstrap design
2013-10-02 12:30:07 +02:00
addons_catalog
// Toolbar modifs
2013-10-08 18:42:07 +02:00
addresses
// Customers group
2013-09-19 14:25:17 +02:00
attachments
// Welcome 2013
2013-01-04 11:19:03 +01:00
attribute_generator
// Attribute generator to bootstrap
2013-09-17 16:36:54 +02:00
attributes
// orders
2013-09-19 12:09:25 +02:00
attributes_groups
// Security
2013-09-18 10:43:58 +02:00
backup
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +02:00
carrier_wizard
bugfix: button tag on line 56 weren't closed
2013-10-07 09:57:55 +02:00
carriers
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
cart_rules
// Remove flags from language select
2013-10-09 19:39:05 +02:00
carts
// Kpi update for customers orders
2013-09-20 18:31:35 +02:00
categories
// Add confirmation on category image delete
2013-10-09 18:47:33 +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
// Pagination bootstraping
2013-10-09 18:36:19 +02:00
customer_threads
// update customer service page
2013-10-07 16:45:48 +02:00
customers
// quick fix customer view
2013-10-10 19:04:25 +02:00
dashboard/helpers/view
// Fix Dashboard toolbar
2013-10-09 19:12:20 +02:00
emails
// Toolbar modifs
2013-10-08 18:42:07 +02:00
employees
// Fixed tabs
2013-10-11 12:10:24 +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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
home
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
images
// Toolbar modifs
2013-10-08 18:42:07 +02:00
import
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
information
// Trad
2013-09-25 17:47: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
// localization
2013-09-13 12:18:27 +02:00
login
// login flip WIP
2013-10-14 09:57:02 +02:00
logs
// fix, design and fun !
2013-08-06 19:06:56 +02:00
maintenance
// Maintenance bootstrap design
2013-09-26 09:37:38 +02:00
manufacturers
// Manufacturer view bootstraped
2013-10-07 14:16:41 +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-10-14 12:21:29 +02:00
modules_positions
// Toolbar modifs
2013-10-08 18:42:07 +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-10-14 12:21:29 +02:00
outstanding
// Welcome 2013
2013-01-04 11:19:03 +01:00
payment
// Payment bootstrap design
2013-09-26 10:09:50 +02:00
performance
[*] BO : improved performances (cache systems) and countries tabs
2013-09-25 19:41:46 +02:00
preferences
// Welcome 2013
2013-01-04 11:19:03 +01:00
products
// Remove flags from language select
2013-10-09 19:39:05 +02:00
referrers
// Add form group to referer view form items
2013-10-07 13:44:04 +02:00
request_sql
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +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
// Toolbar for search
2013-10-09 09:41:10 +02:00
shipping
// Toolbar modifs
2013-10-08 18:42:07 +02:00
shop
// Toolbar modifs
2013-10-08 18:42:07 +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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
states
// Pagination bootstraping
2013-10-09 18:36:19 +02:00
stats
// Removed deprecated option form in stats
2013-09-20 18:18:04 +02:00
statuses
// Remove flags from language select
2013-10-09 19:39:05 +02:00
stock_cover
// Stock cover bootstraping
2013-10-02 18:58:47 +02:00
stock_instant_state
// Instant stock bootstraping
2013-10-02 16:58:27 +02:00
stock_mvt
// Stock movement fix export button on select filter
2013-10-02 17:09:31 +02:00
stores
// Stores controller bootstrap
2013-09-23 13:56:30 +02:00
suppliers
//Suppliers view
2013-09-18 10:29:04 +02:00
supply_orders
// Supply order bootstraping
2013-10-02 18:59:21 +02:00
supply_orders_change_state
// Fix supply order state change save button
2013-10-03 11:51:08 +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
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
tax_rules_group
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
themes
// Toolbar modifs
2013-10-08 18:42:07 +02:00
tracking
[+] BO : Tracking page header toolbar
2013-08-27 18:22:54 +02:00
translations
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
warehouses
// Special external link in warehouse view
2013-09-24 17:19:01 +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