dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
312ad4eb37da25937b2db96fdfa5e2e9c14bbfd2
PrestaShop/controllers/admin
History
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
2013-07-24 17:01:23 +02:00
..
AdminAccessController.php
[-] BO : fixed ajax in permissions tab #PSCFV-7442
2013-06-14 11:20:38 +02:00
AdminAddonsCatalogController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminAddressesController.php
[-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672
2013-07-04 17:00:27 +02:00
AdminAdminPreferencesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminAttachmentsController.php
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
AdminAttributeGeneratorController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminAttributesGroupsController.php
// fix tags in helper
2013-07-24 11:42:47 +02:00
AdminBackupController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminCarriersController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminCartRulesController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminCartsController.php
[-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311
2013-06-17 11:40:35 +02:00
AdminCategoriesController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminCmsCategoriesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminCmsContentController.php
[-] BO: fixed lots of UI bugs in CMS:
2013-02-22 19:59:46 +01:00
AdminCmsController.php
[-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office
2013-06-27 10:19:22 +02:00
AdminContactsController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminCountriesController.php
[-] BO : Bad return value for AdminCountries::processStatus()
2013-07-18 12:12:05 +02:00
AdminCurrenciesController.php
[-] BO : fixed sort by currency exchange rate #PSCFV-9840
2013-07-19 11:40:52 +02:00
AdminCustomerPreferencesController.php
[-] BO: You can now disable the email sent after account creation
2013-05-03 17:01:12 +02:00
AdminCustomersController.php
//small fix
2013-05-22 14:38:39 +02:00
AdminCustomerThreadsController.php
Update AdminCustomerThreadsController.php
2013-07-23 09:58:53 +02:00
AdminDeliverySlipController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminEmailsController.php
[-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password
2013-06-14 15:01:22 +02:00
AdminEmployeesController.php
[-] BO : postcode required in manufacturer address
2013-06-14 10:25:37 +02:00
AdminFeaturesController.php
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
AdminGendersController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminGeolocationController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminGroupsController.php
[-] BO : fixed issue with reduction in the category for groups #PSCFV-9101
2013-05-15 15:23:13 +02:00
AdminHomeController.php
Merge pull request #575 from dreammeup/development
2013-07-16 07:17:03 -07:00
AdminImagesController.php
[-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images
2013-07-17 10:51:34 +02:00
AdminImportController.php
// add another logs information
2013-07-12 10:55:37 +02:00
AdminInformationController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminInvoicesController.php
// update order tab
2013-07-15 17:58:23 +02:00
AdminLanguagesController.php
// Improved label of IETF language tag
2013-07-01 12:35:32 +02:00
AdminLocalizationController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminLoginController.php
[-] BO : Fix bug #PSCFV-8626 rename actual admin folder
2013-04-09 17:43:15 +02:00
AdminLogsController.php
[+] BO: Addition, deletion and edition are now logged
2013-07-11 14:50:23 +02:00
AdminMaintenanceController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminManufacturersController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminMarketingController.php
[+] BO : added new marketing tab
2013-02-13 09:57:30 +01:00
AdminMetaController.php
[-] BO : remove "utm_*" rules preventing Google services from indexing the shop
2013-06-21 17:22:03 +02:00
AdminModulesController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminModulesPositionsController.php
// update positions module tab
2013-07-12 17:48: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
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminOrderPreferencesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminOrdersController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminOutstandingController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminPaymentController.php
// update module tab positions & payment
2013-07-15 11:55:06 +02:00
AdminPdfController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminPerformanceController.php
[-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances
2013-04-03 15:20:15 +02:00
AdminPPreferencesController.php
[-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context
2013-06-26 14:17:45 +02:00
AdminPreferencesController.php
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02:00
AdminProductsController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminProfilesController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminQuickAccessesController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminRangePriceController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminRangeWeightController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminReferrersController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminRequestSqlController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminReturnController.php
//small fix
2013-06-10 12:15:11 +02:00
AdminScenesController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminSearchConfController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminSearchController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminSearchEnginesController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminShippingController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminShopController.php
[-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers
2013-06-27 15:41:37 +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
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminSpecificPriceRuleController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminStatesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminStatsController.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
AdminStatsTabController.php
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
AdminStatusesController.php
// delete multishop toolbar on adminstatuses
2013-03-15 12:07:53 +01:00
AdminStockConfigurationController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminStockCoverController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminStockInstantStateController.php
[-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows
2013-07-18 14:02:22 +02:00
AdminStockManagementController.php
Update AdminStockManagementController.php
2013-07-15 12:45:00 -03:00
AdminStockMvtController.php
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
AdminStoresController.php
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
AdminSuppliersController.php
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
AdminSupplyOrdersController.php
[-] BO : remove deprecated parameter when call Tools::displayDate()
2013-05-20 16:55:52 +02:00
AdminTabsController.php
// small fix
2013-06-25 15:50:36 +02:00
AdminTagsController.php
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-07-24 17:01:23 +02:00
AdminTaxesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminTaxRulesGroupController.php
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
AdminThemesController.php
//norms
2013-07-17 19:05:01 +02:00
AdminTrackingController.php
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
AdminTranslationsController.php
[-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes
2013-07-23 18:47:35 +02:00
AdminWarehousesController.php
[-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table
2013-06-13 15:05:55 +02:00
AdminWebserviceController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
AdminZonesController.php
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00