dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c7ec33f0622b83b305e59063fabfeb374cffaba0
PrestaShop/controllers/admin
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
..
AdminAccessController.php
// Fix Admin access
2013-09-12 15:55:14 +02:00
AdminAddonsCatalogController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminAddressesController.php
[+] BO : Page header toolbar
2013-08-28 09:37:49 +02:00
AdminAdminPreferencesController.php
// update advanced parameters and administration tabs
2013-08-02 17:44:26 +02:00
AdminAttachmentsController.php
[+] BO : Page header toolbar
2013-08-27 18:42:24 +02:00
AdminAttributeGeneratorController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminAttributesGroupsController.php
// Small title fix
2013-08-27 18:25:06 +02:00
AdminBackupController.php
// update advanced parameters
2013-08-02 15:10:58 +02:00
AdminCarriersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +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
[+] BO : Page header toolbar
2013-08-28 10:17:07 +02:00
AdminCartsController.php
[+] BO : Page header toolbar
2013-08-28 09:37:49 +02:00
AdminCategoriesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminCmsCategoriesController.php
// update preferences tab
2013-08-01 16:40:48 +02:00
AdminCmsContentController.php
// Fix CMS missing Page header toolbar
2013-09-12 19:21:53 +02:00
AdminCmsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminContactsController.php
[+] BO : Page header toolbar
2013-08-28 09:37:49 +02:00
AdminCountriesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-21 09:14:10 +02:00
AdminCurrenciesController.php
// update localization tab
2013-07-30 17:45:50 +02:00
AdminCustomerPreferencesController.php
// update preferences tab
2013-07-31 17:43:48 +02:00
AdminCustomersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminCustomerThreadsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminDashboardController.php
//dashactivity configuration
2013-09-12 10:08:28 +02:00
AdminDeliverySlipController.php
[+] BO Orders
2013-07-26 18:54:28 +02:00
AdminEmailsController.php
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
AdminEmployeesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminFeaturesController.php
[+] BO : Page header toolbar
2013-08-27 18:42:24 +02:00
AdminGendersController.php
[+] BO : Page header toolbar
2013-08-28 09:37:49 +02:00
AdminGeolocationController.php
// update preferences tab
2013-08-01 16:40:48 +02:00
AdminGroupsController.php
[+] BO : Page header toolbar
2013-08-28 09:37:49 +02:00
AdminHomeController.php
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
AdminImagesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminImportController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminInformationController.php
// update advanced parameters
2013-08-02 15:10:58 +02:00
AdminInvoicesController.php
// fix col-offset and btn-primary
2013-08-29 17:04:10 +02:00
AdminLanguagesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminLocalizationController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminLoginController.php
[-] BO : Fix bug #PSCFV-8626 rename actual admin folder
2013-04-09 17:43:15 +02:00
AdminLogsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminMaintenanceController.php
// update preferences tab
2013-08-01 16:40:48 +02:00
AdminManufacturersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminMarketingController.php
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
AdminMetaController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminModulesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +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
// BO Stats : Date Picker + Layout WIP
2013-09-02 10:47:07 +02:00
AdminOrdersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +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
// update order tab
2013-07-26 12:15:23 +02:00
AdminProductsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminProfilesController.php
[+] BO : Page header toolbar
2013-08-28 14:07:50 +02:00
AdminQuickAccessesController.php
[+] BO : Page header toolbar
2013-08-28 14:07:50 +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
[+] BO : Page header toolbar
2013-08-28 14:07:50 +02:00
AdminRequestSqlController.php
// update advanced parameters
2013-08-02 15:10:58 +02:00
AdminReturnController.php
// update order tab
2013-07-26 12:15:23 +02:00
AdminScenesController.php
[+] BO : Page header toolbar
2013-08-27 18:42:24 +02:00
AdminSearchConfController.php
// update preferences tab
2013-08-01 16:40:48 +02:00
AdminSearchController.php
// BO Bootstrap Search result page
2013-09-02 11:02:23 +02:00
AdminSearchEnginesController.php
[+] BO : Page header toolbar
2013-08-28 14:07:50 +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
// Added target blank in a transverse link
2013-08-21 10:18:46 +02:00
AdminShopGroupController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminShopUrlController.php
[-] BO : Fix Bug #PSCFV-9550 Bad URL redirection
2013-07-16 09:59:47 +02:00
AdminSlipController.php
[+] BO : Page header toolbar
2013-08-28 09:24:16 +02:00
AdminSpecificPriceRuleController.php
[+] BO : Page header toolbar
2013-08-28 10:17:07 +02:00
AdminStatesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminStatsController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminStatsTabController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminStatusesController.php
[+] BO : Page header toolbar
2013-08-28 09:24:16 +02:00
AdminStockConfigurationController.php
// update stock tab
2013-08-05 12:13:43 +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
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminStockMvtController.php
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminStoresController.php
// update preferences tab
2013-08-01 16:40:48 +02:00
AdminSuppliersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminSupplyOrdersController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminTabsController.php
[+] BO : Page header toolbar
2013-08-28 14:07:50 +02:00
AdminTagsController.php
[+] BO : Page header toolbar
2013-08-27 18:42:24 +02:00
AdminTaxesController.php
// update localization tab
2013-07-30 17:45:50 +02:00
AdminTaxRulesGroupController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminThemesController.php
// update advanced parameters
2013-08-02 15:10:58 +02:00
AdminTrackingController.php
[+] BO : Tracking page header toolbar
2013-08-27 18:22:54 +02:00
AdminTranslationsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-13 11:41:14 +02:00
AdminWarehousesController.php
[+] BO : Page header toolbar
2013-08-28 14:14:04 +02:00
AdminWebserviceController.php
// update advanced parameters
2013-08-02 15:10:58 +02:00
AdminZonesController.php
[-] BO : Page header toolbar
2013-08-28 13:43:42 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00