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.

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

Merge v19 into v20 #2370

Merged
merged 40 commits into from
Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
250eb1f
Merge PR #2342
sreichel Aug 2, 2022
2e02eab
Revert "Add basic text for Ukraine (#2074)" (#2325)
fballiano Aug 2, 2022
58de841
Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avo…
fballiano Aug 2, 2022
a3fdffc
Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137)
Schrank Aug 3, 2022
ac1fa93
Blocked access to all dot files (#2349)
colinmollenhour Aug 3, 2022
44c7c0f
Capitalization Adjustment Regarding CamelCase in Method Names (#2365)
Sdfendor Aug 5, 2022
f6dcc38
Some microoptimization (#2335)
sreichel Aug 5, 2022
64dd9b0
Enclosed error with <pre> tag for prettier error print (if developer …
kiatng Aug 5, 2022
4fb7615
Updated phpstan to 1.8.2 (#2367)
sreichel Aug 5, 2022
ef45711
Escape product titles in MSRP JavaScript (#2366)
discountscott Aug 5, 2022
ceb122e
Update boxes.css (#2330)
addison74 Aug 5, 2022
cb0af47
Force describeTable() to use read DB adapter (#2371)
fballiano Aug 6, 2022
f46bedb
Do not install n98/n98_layouthelper (#2373)
sreichel Aug 6, 2022
83a3e9f
Add apt update to XML validation workflow (#2376)
fballiano Aug 7, 2022
4990fea
Merge branch '20.0' into merge_v19_into_v20
sreichel Aug 9, 2022
23d180d
Merged PR #2375
kiatng Aug 7, 2022
0e74e2e
Replace remaining "sizeof" calls with "count" (#2369)
Sdfendor Aug 7, 2022
0f96118
Remove DISCLAIMER and change Magento -> OpenMage in header (#2297)
justinbeaty Aug 9, 2022
6d186d5
Added label for phpstan cosmetic changes (#2384)
sreichel Aug 9, 2022
f109fc6
Added weight to salesOrderShipmentAddTrack API (#1377)
luigifab Aug 9, 2022
c4958d5
PHPStan/DOCBlock fixes (#2336)
sreichel Aug 9, 2022
53978e1
Updated docs for email addTo() (#2382)
sreichel Aug 9, 2022
22cbcc0
Updated phpstan experimental (#2386)
sreichel Aug 9, 2022
21d1e77
Cosmetic changes to Mage_Payment_Model_Method_Abstract::validate() (#…
fballiano Aug 9, 2022
cabf516
Replaced join() calls with implode() (#2389)
Sdfendor Aug 9, 2022
8981f6b
Hidden empty sub menu from backend (#2391)
luigifab Aug 9, 2022
64c7d0e
Remove Thumbs.db file (#2394)
luigifab Aug 9, 2022
11a1379
Support PHP 8.1 in composer.json (#2378)
addison74 Aug 10, 2022
f7fff3c
Blocked various file types in .htaccess (#2359)
colinmollenhour Aug 10, 2022
ec83040
Color swatches work with disparate product IDs (#2390)
luigifab Aug 10, 2022
bca37b0
Move Credit Memo at the end of the buttons list (#2392)
luigifab Aug 10, 2022
7633af6
Version bump (#2387)
fballiano Aug 10, 2022
fc33598
Minor fixes on 'filter_condition_callback' method _filterStoreConditi…
kiatng Aug 10, 2022
fd5e602
add ReturnTypeWillChange to various Files catched by code style check…
Flyingmana Aug 10, 2022
b58675d
Phpstan fixes (#2396)
sreichel Aug 11, 2022
361d027
Fixed rollBack() camelCase error reported by phpstan (#2403)
sreichel Aug 11, 2022
6cd3044
Changes default root dir in composer.json (#2401)
sreichel Aug 11, 2022
393a6ab
Fixed targetNamespace for WS-I Compliant SOAP APIs (#2405)
leissbua Aug 11, 2022
49b72c0
Merge branch '20.0' into merge_v19_into_v20
sreichel Aug 11, 2022
902889a
Updated phpstan baseline
sreichel Aug 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
- .phpstorm.meta.php/*
- .travis.yml

'phpstan':
- .github/phpstan.neon
- .github/phpstan-baseline.neon
- .github/phpstan_experimental_level.neon

'htaccess':
- .htaccess

Expand Down
Loading