dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4da04275fe8cbb7e2e98bf0ceb2a6384d52c4c40
PrestaShop/controllers/admin
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
..
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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminAdminPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminAttachmentsController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminAttributeGeneratorController.php
// Attribute generator to bootstrap
2013-09-17 16:36:54 +02:00
AdminAttributesGroupsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +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-10-14 12:21:29 +02:00
AdminCartRulesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminCartsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminCategoriesController.php
// CSS fixes
2013-10-09 15:11:04 +02:00
AdminCmsCategoriesController.php
// Cms categories list
2013-09-23 10:13:45 +02:00
AdminCmsContentController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminCmsController.php
// Cms categories list
2013-09-23 10:13:45 +02:00
AdminContactsController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminCountriesController.php
// Add new country button to countries controller
2013-10-09 09:51:25 +02:00
AdminCurrenciesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminCustomerPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminCustomersController.php
// Toolbar modifs
2013-10-08 18:42:07 +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
// Adding compare dates to date range picker
2013-10-11 18:30:05 +02:00
AdminDeliverySlipController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminEmailsController.php
// Fix upgrade and dashboard
2013-10-11 14:07:03 +02:00
AdminEmployeesController.php
// Fix upgrade and dashboard
2013-10-11 14:07:03 +02:00
AdminFeaturesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
AdminGendersController.php
// Toolbar modifs
2013-10-08 18:42:07 +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-10-14 12:21:29 +02:00
AdminHomeController.php
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
AdminImagesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminImportController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02: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
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminLocalizationController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminLoginController.php
// feedback button
2013-10-11 18:26:12 +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
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminMarketingController.php
// Toolbar modifs
2013-10-08 18:42:07 +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-10-14 12:21:29 +02:00
AdminModulesPositionsController.php
// Toolbar modifs
2013-10-08 18:42:07 +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
// 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-10-14 12:21:29 +02: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
// Toolbar modifs
2013-10-08 18:42:07 +02: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-10-14 12:21:29 +02: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 Bootstrap Search result page
2013-09-02 11:02:23 +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
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminSpecificPriceRuleController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStatesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStatsController.php
// Fixed typo
2013-10-11 16:35:49 +02:00
AdminStatsTabController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStatusesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStockConfigurationController.php
// Advanced stock bootstrap design
2013-09-27 12:24:44 +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
// Toolbar modifs
2013-10-08 18:42:07 +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
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminSuppliersController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminSupplyOrdersController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminTabsController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminTagsController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminTaxesController.php
// Toolbar modifs
2013-10-08 18:42:07 +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
// Toolbar modifs
2013-10-08 18:42:07 +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-10-14 12:21:29 +02:00
AdminWarehousesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminWebserviceController.php
// Toolbar modifs
2013-10-08 18:42:07 +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