Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge v19 -> v20 #2571

Merged
merged 86 commits into from
Nov 7, 2022
Merged

Merge v19 -> v20 #2571

merged 86 commits into from
Nov 7, 2022

Conversation

fballiano
Copy link
Contributor

Cherry picking from v19.4.18...1.9.4.x and fixing conflicts

fballiano and others added 13 commits September 7, 2022 10:47
@fballiano
Fixed whitespace for docblocks (#2550)
ad144a0
@elidrissidev @fballiano
Remove redundant polyfill code for error reporting constants (#2555)
88442db
@fballiano
Fixed whitespace for docblocks (#2556)
3759da2
@sreichel @fballiano
Some CSS fixes to OpenMage adminhtml theme (#2422)
63fe2f8
@fballiano
Fixed whitespace for docblocks (#2558)
9c3292d
@sreichel @fballiano
Set default width for grid datetime columns, ref #2239 (#2544)
39786c3
@fballiano
Removed PHP 5.3 compatibility code from Mage_Adminhtml_Model_System_C…
38e6465 
…onfig_Backend_Locale_Timezone (#2563)
@fballiano
Added info about targetNamespace change in README (#2559)
72cf5aa 
* Added info about targetNamespace change

* Update README.md
@fballiano
Removed unused controller Mage_Shipping_ShippingController (#2564)
2fdc338
@sreichel @fballiano
PHPStan: fixed calls on Varien_Object/Mage_Core_Model_Abstract (#2565)
81abc58
@sreichel @fballiano
Added scss-cache and .phar files to .gitignore (#2566)
1493f9d
@sreichel @fballiano
Changed boolean/integer to bool/int in docblocks (#2567)
fc7568b
@fballiano
Fixed whitespace for docblocks (#2562)
ff9bb2c
@github-actions github-actions bot added Component: AdminNotification Relates to Mage_AdminNotification Component: Adminhtml Relates to Mage_Adminhtml Component: Admin Relates to Mage_Admin Component: Api PageRelates to Mage_Api Component: Api2 Relates to Mage_Api2 Component: Authorizenet Relates to Mage_Authorizenet Component: Backup Relates to Mage_Backup Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogRule Relates to Mage_CatalogRule Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogSearch Relates to Mage_CatalogSearch Component: Centinel Relates to Mage_Centinel Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms labels Sep 7, 2022
@fballiano
Copy link
Contributor Author

updated, but need to merge #2636 cause the conflict is not trivial

@fballiano
Copy link
Contributor Author

I've finished merging all of the commits, also including #2636 which had a conflict that wasn't super clean, if somebody wants to check it out, the file was app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php

kiatng
kiatng previously approved these changes Nov 3, 2022
View reviewed changes
Copy link
Contributor

@kiatng kiatng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Time for new release.

elidrissidev
elidrissidev previously approved these changes Nov 6, 2022
View reviewed changes
Copy link
Member

@elidrissidev elidrissidev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've rechecked some of the major changes in this release 🤞.

@fballiano fballiano dismissed stale reviews from elidrissidev and kiatng via 7d2e310 November 7, 2022 09:35
@fballiano fballiano mentioned this pull request Nov 7, 2022
Merged
3 tasks
@fballiano fballiano merged commit d481a55 into OpenMage:20.0 Nov 7, 2022
@fballiano fballiano deleted the merge_v19_v20 branch November 7, 2022 10:45
@github-actions
Copy link
Contributor

github-actions bot commented Nov 7, 2022

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  7 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit d481a55. ± Comparison against base commit 61f1a22.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kiatng kiatng kiatng approved these changes

@elidrissidev elidrissidev elidrissidev approved these changes

Assignees
No one assigned
Labels
Component: Admin Relates to Mage_Admin Component: Adminhtml Relates to Mage_Adminhtml Component: AdminNotification Relates to Mage_AdminNotification Component: Api PageRelates to Mage_Api Component: Api2 Relates to Mage_Api2 Component: Authorizenet Relates to Mage_Authorizenet Component: Backup Relates to Mage_Backup Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogRule Relates to Mage_CatalogRule Component: CatalogSearch Relates to Mage_CatalogSearch Component: Centinel Relates to Mage_Centinel Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Contacts Relates to Mage_Contacts Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron Component: CurrencySymbol Relates to Mage_CurrencySymbol Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Directory Relates to Mage_Directory Component: Downloadable Relates to Mage_Downloadable Component: PayPal Relates to Mage_Paypal documentation environment Mage.php Relates to app/Mage.php phpstan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@fballiano @sreichel @elidrissidev @kiatng @Sdfendor @colinmollenhour @luigifab @Sekiphp @justinbeaty @przemyslaw-p