dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9eefcfd0588a8552f109d27992fa3e4881c847b1
PrestaShop/controllers/admin
T
History
Kevin Granger 9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
2013-11-21 17:43:51 +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
// Fix missing page header in combinations generator
2013-11-06 14:42:56 +01:00
AdminAttributesGroupsController.php
// Features and attributes title and buttons
2013-11-21 12:10:15 +01: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
//typo
2013-11-06 10:56:56 +01:00
AdminCartRulesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +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
// General modification for view and edit title
2013-11-12 11:06:20 +01:00
AdminCmsCategoriesController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminCmsContentController.php
// update cms controller title
2013-11-20 15:19:07 +01: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
// Some bootstrap changes in controllers
2013-11-20 18:44:20 +01:00
AdminCustomerPreferencesController.php
// Some missing icons and multistore problems
2013-09-25 19:00:29 +02:00
AdminCustomersController.php
// Fixed htmlentities in KPIs
2013-11-05 16:01:48 +01:00
AdminCustomerThreadsController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
AdminDashboardController.php
// Some bootstrap changes in controllers
2013-11-20 18:44:20 +01:00
AdminDeliverySlipController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminEmailsController.php
[-] BO : FixBug #PSCSX-33 Misplaced save button
2013-11-20 14:50:31 +01:00
AdminEmployeesController.php
// Change edit title on employees controller
2013-11-12 12:05:00 +01:00
AdminFeaturesController.php
// Features and attributes title and buttons
2013-11-21 12:10:15 +01:00
AdminGendersController.php
// Changing add new title button label
2013-11-21 10:04:03 +01:00
AdminGeolocationController.php
// Bootstrap icons
2013-09-25 19:03:43 +02:00
AdminGroupsController.php
[*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2]
2013-11-21 14:44:00 +01: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-21 17:43:51 +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
// Languages boostraping
2013-11-20 18:20:19 +01:00
AdminLocalizationController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01: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
// Update image when updated
2013-11-04 18:26:24 +01:00
AdminMarketingController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminMetaController.php
// Preferences identrifer names
2013-11-12 11:55:54 +01:00
AdminModulesController.php
// oops
2013-11-18 17:42:26 +01:00
AdminModulesPositionsController.php
// Fix Module exception in transplant
2013-10-30 18:11:33 +01:00
AdminNotFoundController.php
// This Controller needs a toolbar and a title
2013-11-07 17:15:40 +01: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-21 17:43:51 +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-21 17:43:51 +01:00
AdminPPreferencesController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01: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-21 17:43:51 +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
// Preferences identrifer names
2013-11-12 11:55:54 +01:00
AdminSearchController.php
// Invoice search fix
2013-11-15 15:00:56 +01:00
AdminSearchEnginesController.php
// Set Identifier name for search engine
2013-11-12 11:30:26 +01:00
AdminShippingController.php
// Remove unnecessary button from shipping options
2013-11-21 10:12:53 +01:00
AdminShopController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
AdminShopGroupController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
AdminShopUrlController.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
AdminSlipController.php
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
AdminSpecificPriceRuleController.php
// sprintf & English
2013-11-08 11:39:59 +01:00
AdminStatesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminStatsController.php
// Fixed module KPI
2013-11-04 14:39:53 +01:00
AdminStatsTabController.php
// Stats cleaning
2013-10-29 15:29:55 +01:00
AdminStatusesController.php
// Update image when updated
2013-11-04 18:26:24 +01: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
// Update image when updated
2013-11-04 18:26:24 +01: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
// Fix missing last actions button in tracking controller list
2013-11-15 16:25:31 +01:00
AdminTranslationsController.php
// Timeout increased for translation download #PSCFV-11046
2013-11-18 15:37:34 +01:00
AdminWarehousesController.php
// Toolbar modifs
2013-10-08 18:42:07 +02:00
AdminWebserviceController.php
// English
2013-11-07 12:27:48 +00: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