Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
01eecb6
rebase
fballiano May 15, 2023
bb33faf
license
fballiano May 15, 2023
19602b4
license
fballiano May 15, 2023
02e319c
Merge branch 'main' into upload_logo
fballiano Feb 7, 2024
0a6386a
Merge branch 'main' into upload_logo
kiatng Feb 8, 2024
87190d0
removed lines from gitignore
fballiano Feb 8, 2024
77a6b33
PHPCS
fballiano Feb 8, 2024
1904b69
PHPCS
fballiano Feb 8, 2024
2e4c018
whitespace
fballiano Feb 8, 2024
10bb7a0
unneeded whitespace
fballiano Feb 8, 2024
3c2309a
PHPCS
fballiano Feb 8, 2024
4311b37
fixed copyright notes
fballiano Feb 8, 2024
5e8b808
PHPCS
fballiano Feb 8, 2024
6e864b2
PHPCS
fballiano Feb 8, 2024
822ec0a
Merge branch 'main' into upload_logo
fballiano May 1, 2024
bc47072
Removed GIF logos
fballiano May 1, 2024
0afa449
Merge branch 'main' into upload_logo
sreichel Jan 11, 2025
d912f69
Merge branch 'main' into upload_logo
sreichel Jan 11, 2025
d566ee0
Merge branch 'main' into upload_logo
addison74 Sep 27, 2025
cd039f8
Merge branch 'main' into upload_logo
kiatng Oct 15, 2025
2e8bdb5
Revise copyright and license comments in Logo.php
kiatng Oct 15, 2025
3dc6814
Update copyright and license comments in Logosmall.php
kiatng Oct 15, 2025
37bc015
Update app/code/core/Mage/Page/Block/Html/Header.php
kiatng Oct 15, 2025
d55e65f
Fix missing closing parenthesis in getLogoSrcSmall
kiatng Oct 15, 2025
4bb1d46
Fix backend model and base URL for logo images
kiatng Oct 15, 2025
55cf75f
Remove LOGO_SMALL_DIR constant from Header.php
kiatng Oct 15, 2025
6391a4e
Refactor logo source retrieval methods
sreichel Oct 15, 2025
9119000
Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image…
sreichel Oct 15, 2025
207152f
Update app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image…
sreichel Oct 15, 2025
e78cc28
Update app/code/core/Mage/Page/Block/Html/Header.php
sreichel Oct 15, 2025
e05a723
Remove unused attribute "scope_info" in system.xml
kiatng Oct 20, 2025
fc9a60f
Restore scope_info attribute to base_url in system.xml
kiatng Oct 20, 2025
cb63529
Fix bug on incorrect URL when logo is uploaded via admin
kiatng Oct 20, 2025
6f63e14
Merge branch 'main' into upload_logo
sreichel Oct 20, 2025
7abcb77
Improvements and bug fix
kiatng Oct 21, 2025
bb30125
PHP-CS fix
kiatng Oct 21, 2025
c93d446
Fix rector
kiatng Oct 21, 2025
56dc69c
Minor corrections
kiatng Oct 21, 2025
0b667c5
phpmd
sreichel Oct 22, 2025
22001ba
minor fixes
sreichel Oct 22, 2025
7a8ebe4
phpstorm meta
sreichel Oct 22, 2025
f9c2336
Add option to use main logo as small logo and update translations
kiatng Oct 22, 2025
88c9ca2
Merge branch 'upload_logo' of https://github.com/warleyelias/magento-…
kiatng Oct 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .phpstorm.meta.php/magento_blocks.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@
'adminhtml/system_config_form_field_heading' => \Mage_Adminhtml_Block_System_Config_Form_Field_Heading::class,
'adminhtml/system_config_form_field_image' => \Mage_Adminhtml_Block_System_Config_Form_Field_Image::class,
'adminhtml/system_config_form_field_import' => \Mage_Adminhtml_Block_System_Config_Form_Field_Import::class,
'adminhtml/system_config_form_field_logo' => \Mage_Adminhtml_Block_System_Config_Form_Field_Logo::class,
'adminhtml/system_config_form_field_notification' => \Mage_Adminhtml_Block_System_Config_Form_Field_Notification::class,
'adminhtml/system_config_form_field_regexceptions' => \Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions::class,
'adminhtml/system_config_form_field_select_allowspecific' => \Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific::class,
Expand Down
1 change: 1 addition & 0 deletions .phpstorm.meta.php/magento_blocks_methods.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@
'adminhtml/system_config_form_field_heading' => \Mage_Adminhtml_Block_System_Config_Form_Field_Heading::class,
'adminhtml/system_config_form_field_image' => \Mage_Adminhtml_Block_System_Config_Form_Field_Image::class,
'adminhtml/system_config_form_field_import' => \Mage_Adminhtml_Block_System_Config_Form_Field_Import::class,
'adminhtml/system_config_form_field_logo' => \Mage_Adminhtml_Block_System_Config_Form_Field_Logo::class,
'adminhtml/system_config_form_field_notification' => \Mage_Adminhtml_Block_System_Config_Form_Field_Notification::class,
'adminhtml/system_config_form_field_regexceptions' => \Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions::class,
'adminhtml/system_config_form_field_select_allowspecific' => \Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific::class,
Expand Down
1 change: 1 addition & 0 deletions .phpstorm.meta.php/magento_helpers.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down
16 changes: 16 additions & 0 deletions .phpstorm.meta.php/magento_helpers_methods.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -253,6 +254,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -450,6 +452,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -647,6 +650,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -844,6 +848,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -1041,6 +1046,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -1238,6 +1244,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -1435,6 +1442,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -1632,6 +1640,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -1829,6 +1838,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -2026,6 +2036,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -2223,6 +2234,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -2420,6 +2432,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -2617,6 +2630,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -2814,6 +2828,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down Expand Up @@ -3011,6 +3026,7 @@
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
'catalog/output' => \Mage_Catalog_Helper_Output::class,
'catalog/price' => \Mage_Catalog_Helper_Price::class,
'catalog/product' => \Mage_Catalog_Helper_Product::class,
'catalog/product_compare' => \Mage_Catalog_Helper_Product_Compare::class,
'catalog/product_configuration' => \Mage_Catalog_Helper_Product_Configuration::class,
Expand Down
2 changes: 2 additions & 0 deletions .phpstorm.meta.php/magento_models.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
'adminhtml/system_config_backend_gatewayurl' => \Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl::class,
'adminhtml/system_config_backend_image' => \Mage_Adminhtml_Model_System_Config_Backend_Image::class,
'adminhtml/system_config_backend_image_favicon' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Favicon::class,
'adminhtml/system_config_backend_image_logo' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Logo::class,
'adminhtml/system_config_backend_image_pdf' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Pdf::class,
'adminhtml/system_config_backend_layer_children' => \Mage_Adminhtml_Model_System_Config_Backend_Layer_Children::class,
'adminhtml/system_config_backend_locale' => \Mage_Adminhtml_Model_System_Config_Backend_Locale::class,
Expand Down Expand Up @@ -3309,6 +3310,7 @@
'adminhtml/system_config_backend_gatewayurl' => \Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl::class,
'adminhtml/system_config_backend_image' => \Mage_Adminhtml_Model_System_Config_Backend_Image::class,
'adminhtml/system_config_backend_image_favicon' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Favicon::class,
'adminhtml/system_config_backend_image_logo' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Logo::class,
'adminhtml/system_config_backend_image_pdf' => \Mage_Adminhtml_Model_System_Config_Backend_Image_Pdf::class,
'adminhtml/system_config_backend_layer_children' => \Mage_Adminhtml_Model_System_Config_Backend_Layer_Children::class,
'adminhtml/system_config_backend_locale' => \Mage_Adminhtml_Model_System_Config_Backend_Locale::class,
Expand Down
Loading
Loading