dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
889a2006ecc7e70f5076f75d200459c5bf64703c
PrestaShop/controllers/admin
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
..
AdminAccessController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminAddonsCatalogController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminAddressesController.php
// Fields resizing
2013-10-25 11:25:13 +02:00
AdminAdminPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminAttachmentsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminAttributeGeneratorController.php
// Attribute generator to bootstrap
2013-09-17 16:36:54 +02:00
AdminAttributesGroupsController.php
// Added field (bootstrap) size in helper form
2013-10-25 10:16:39 +02:00
AdminBackupController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminCarriersController.php
// Carrier list size
2013-09-23 18:04:18 +02:00
AdminCarrierWizardController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminCartRulesController.php
// UI fixs
2013-10-31 12:20:29 +01:00
AdminCartsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminCategoriesController.php
// Added KPIs to the category page and fixed dashboard data
2013-10-29 11:03:09 +01:00
AdminCmsCategoriesController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminCmsContentController.php
// Fix CMS filter, reset and sort
2013-10-14 17:28:21 +02:00
AdminCmsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminContactsController.php
// Fields resizing
2013-10-25 11:25:13 +02:00
AdminCountriesController.php
// fix admin edit countries
2013-10-23 11:18:31 +02:00
AdminCurrenciesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminCustomerPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminCustomersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminCustomerThreadsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminDashboardController.php
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-30 10:52:04 +01:00
AdminDeliverySlipController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminEmailsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminEmployeesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminFeaturesController.php
// Fix list title
2013-10-24 17:18:14 +02:00
AdminGendersController.php
// Fields resizing
2013-10-25 11:25:13 +02:00
AdminGeolocationController.php
// Bootstrap icons
2013-09-25 19:03:43 +02:00
AdminGroupsController.php
// notice
2013-10-25 11:35:01 +02:00
AdminHomeController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminImagesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminImportController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminInformationController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminInvoicesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminLanguagesController.php
// Update image fix
2013-10-18 17:59:45 +02:00
AdminLocalizationController.php
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
AdminLoginController.php
// admin create order WIP
2013-10-23 18:54:44 +02:00
AdminLogsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminMaintenanceController.php
// Bootstrap icons
2013-09-25 19:03:43 +02:00
AdminManufacturersController.php
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-25 14:29:02 +02:00
AdminMarketingController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminMetaController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminModulesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminModulesPositionsController.php
// Fix Module exception in transplant
2013-10-30 18:11:33 +01:00
AdminNotFoundController.php
[-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable
2013-05-15 11:31:55 +02:00
AdminOrderMessageController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminOrderPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminOrdersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminOutstandingController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminPaymentController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminPdfController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminPerformanceController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminPPreferencesController.php
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
AdminPreferencesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminProductsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminProfilesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminQuickAccessesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminRangePriceController.php
[+] BO : Page header toolbar
2013-08-28 11:16:36 +02:00
AdminRangeWeightController.php
[+] BO : Page header toolbar
2013-08-28 11:16:36 +02:00
AdminReferrersController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminRequestSqlController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminReturnController.php
// update order tab
2013-07-26 12:15:23 +02:00
AdminScenesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminSearchConfController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminSearchController.php
[*] BO : search results improvements (no unaccessible tabs, better display, better information)
2013-10-25 15:19:03 +02:00
AdminSearchEnginesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminShippingController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminShopController.php
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
AdminShopGroupController.php
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
AdminShopUrlController.php
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
AdminSlipController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminSpecificPriceRuleController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminStatesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStatsController.php
// Added KPIs to the category page and fixed dashboard data
2013-10-29 11:03:09 +01:00
AdminStatsTabController.php
// Stats cleaning
2013-10-29 15:29:55 +01:00
AdminStatusesController.php
// Update image when updated
2013-10-18 17:41:36 +02:00
AdminStockConfigurationController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminStockCoverController.php
// Stock cover bootstraping
2013-10-02 18:58:47 +02:00
AdminStockInstantStateController.php
// Stock instant bootstraping
2013-10-02 18:59:34 +02:00
AdminStockManagementController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminStockMvtController.php
// Remove attribute language desc from stock movement list when product attribute is removed
2013-10-04 15:30:27 +02:00
AdminStoresController.php
// Some changes to integrate uploader helper
2013-10-25 14:20:42 +02:00
AdminSuppliersController.php
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-25 14:29:02 +02:00
AdminSupplyOrdersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminTabsController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminTagsController.php
// Remove translations on icon class
2013-10-21 09:57:13 +02:00
AdminTaxesController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminTaxRulesGroupController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminThemesController.php
// Some changes to integrate uploader helper
2013-10-25 14:20:42 +02:00
AdminTrackingController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminTranslationsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
AdminWarehousesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminWebserviceController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminZonesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00