dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7019af3a11fca9c117818dbfe2c4e4b8d663caaa
PrestaShop/controllers/admin
History
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
..
AdminAccessController.php
// Fix Page header toolbar
2013-09-16 17:05:27 +02:00
AdminAddonsCatalogController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminAddressesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminAdminPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminAttachmentsController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminAttributeGeneratorController.php
// Attribute generator to bootstrap
2013-09-17 16:36:54 +02:00
AdminAttributesGroupsController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminBackupController.php
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +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-09-13 11:41:14 +02:00
AdminCartRulesController.php
// Cart rules bootstrap design
2013-09-26 14:55:28 +02:00
AdminCartsController.php
// Copy KPIs from customer to cart
2013-09-24 15:54:45 +02:00
AdminCategoriesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminCmsCategoriesController.php
// Cms categories list
2013-09-23 10:13:45 +02:00
AdminCmsContentController.php
// Fix CMS missing Page header toolbar
2013-09-12 19:21:53 +02:00
AdminCmsController.php
// Cms categories list
2013-09-23 10:13:45 +02:00
AdminContactsController.php
// Customer fix
2013-09-18 17:05:16 +02:00
AdminCountriesController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
AdminCurrenciesController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02: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-09-30 11:01:23 +02:00
AdminCustomerThreadsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminDashboardController.php
[+] BO : Added fees configuration for the dashboard
2013-09-24 12:22:40 +02:00
AdminDeliverySlipController.php
[+] BO Orders
2013-07-26 18:54:28 +02:00
AdminEmailsController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminEmployeesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminFeaturesController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminGendersController.php
// Customer fix
2013-09-18 17:05:16 +02:00
AdminGeolocationController.php
// Bootstrap icons
2013-09-25 19:03:43 +02:00
AdminGroupsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminHomeController.php
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
AdminImagesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminImportController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminInformationController.php
// Fix Page header toolbar
2013-09-16 17:05:27 +02:00
AdminInvoicesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminLanguagesController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
AdminLocalizationController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
AdminLoginController.php
[-] BO : Fix bug #PSCFV-8626 rename actual admin folder
2013-04-09 17:43:15 +02:00
AdminLogsController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminMaintenanceController.php
// Bootstrap icons
2013-09-25 19:03:43 +02:00
AdminManufacturersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminMarketingController.php
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
AdminMetaController.php
// List header fix
2013-09-18 17:23:22 +02:00
AdminModulesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminModulesPositionsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02: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
[+] BO : Page header toolbar
2013-08-28 09:24:16 +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-09-30 11:01:23 +02:00
AdminOutstandingController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminPaymentController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminPdfController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminPerformanceController.php
// Small improvement of the performances tab
2013-09-25 19:47:55 +02:00
AdminPPreferencesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-21 09:14:10 +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-09-30 11:01:23 +02:00
AdminProfilesController.php
// Some list design fix
2013-09-18 15:25:58 +02:00
AdminQuickAccessesController.php
// Administration list column size
2013-09-25 11:46:12 +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
// update stats tabs
2013-09-19 17:36:27 +02:00
AdminRequestSqlController.php
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +02:00
AdminReturnController.php
// update order tab
2013-07-26 12:15:23 +02:00
AdminScenesController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminSearchConfController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminSearchController.php
// BO Bootstrap Search result page
2013-09-02 11:02:23 +02:00
AdminSearchEnginesController.php
// update stats tabs
2013-09-19 17:36:27 +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
// Slip and Statuses bootstrap design
2013-09-26 17:30:34 +02:00
AdminSpecificPriceRuleController.php
// Prices rules list size
2013-09-26 15:01:23 +02:00
AdminStatesController.php
// missing method
2013-09-26 13:49:17 +02:00
AdminStatsController.php
// Added Translations KPIs
2013-09-27 14:51:12 +02:00
AdminStatsTabController.php
// Removed deprecated option form in stats
2013-09-20 18:18:04 +02:00
AdminStatusesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminStockConfigurationController.php
// Advanced stock bootstrap design
2013-09-27 12:24:44 +02:00
AdminStockCoverController.php
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminStockInstantStateController.php
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminStockManagementController.php
// Webservice controller bootstrap design
2013-09-25 11:29:11 +02:00
AdminStockMvtController.php
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminStoresController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminSuppliersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminSupplyOrdersController.php
// Advanced stock bootstrap design
2013-09-27 12:24:44 +02:00
AdminTabsController.php
// Fix menu list position col
2013-09-19 18:08:20 +02:00
AdminTagsController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminTaxesController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
AdminTaxRulesGroupController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
AdminThemesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminTrackingController.php
// Products section list adjustment
2013-09-20 16:19:50 +02:00
AdminTranslationsController.php
// Added Translations KPIs
2013-09-27 14:51:12 +02:00
AdminWarehousesController.php
// Wharehouse view bootstrap fix
2013-09-24 16:20:05 +02:00
AdminWebserviceController.php
// Advanced stock bootstrap design
2013-09-27 12:24:44 +02:00
AdminZonesController.php
// Localization Bootstrap design
2013-09-26 11:36:28 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00