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

Theme Mimic (luma style) #1682

Closed
wants to merge 34 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
16c8e84
bump version
Flyingmana Jun 28, 2020
ad7aa31
Merge tag 'v19.4.5' into 20.0
Flyingmana Jul 7, 2020
e878064
Merge tag 'v19.4.6' into 20.0
Flyingmana Aug 18, 2020
1317bca
Merge remote-tracking branch 'origin/1.9.4.x' into 20.0
colinmollenhour Aug 20, 2020
8627073
Fix _addUrlRewrite() ignoring collection store scope. (#510)
edannenberg Aug 21, 2020
79106ba
Add doc comments to image related classes (#1146)
tmotyl Aug 20, 2020
03a4798
Prevent duplicate entry when updating salesrule_coupon_usage (#1117)
drwilliams Aug 21, 2020
7974e12
Merge tag 'v19.4.7' into 20.0
Flyingmana Sep 14, 2020
090ea91
Merge tag 'v19.4.8' into 20.0
Flyingmana Oct 20, 2020
f7b3c52
Merge tag 'v19.4.9' into 20.0
Flyingmana Dec 29, 2020
4e0dc62
Merge tag 'v19.4.10' into 20.0
mark-netalico Jan 19, 2021
111adf0
Suggestion to add some debugging to lockfile (to identify fileownersh…
seansan Feb 13, 2021
5309c0d
Merge tag 'v19.4.11' into 20.0
Flyingmana Feb 14, 2021
a4b82bf
Remove invalid branch alias to make the branch importable on packagis…
Seldaek Feb 26, 2021
ca3d916
Directory currency - performance optimalization (#1252)
Sekiphp Mar 27, 2021
42988a6
Move orig data to abstract model (like M2) (#1325)
Sekiphp Mar 27, 2021
6e0c530
Remove Deprecated _afterSaveCommit from Mage_Core_Model_Abstract (#1502)
Sekiphp Apr 6, 2021
0c28613
Merge tag 'v19.4.12' into 20.0
Flyingmana Apr 6, 2021
89e1c6f
Bump Version
Flyingmana Apr 6, 2021
ced97cd
Remove hints (#1536)
fballiano Apr 17, 2021
538b568
Merge tag 'v19.4.13' into 20.0
Flyingmana Apr 20, 2021
b49a2b1
update changelog
Flyingmana Apr 20, 2021
d1c7b4b
bump version
Flyingmana Apr 20, 2021
52784b6
Fixed incorrect regex in _underscore (#1567)
J-Kostecka Apr 29, 2021
8496673
Prevent backend_type from being changed automatically on attribute sa…
woutersamaey Apr 30, 2021
46ebf30
Performance improvement (#1555)
luigifab Apr 30, 2021
721501a
Removed "default" themes (#1600)
fballiano May 12, 2021
9f0a35c
Reinstate getters and setters for $_pageHelpUrl which some third part…
fitzjohnit May 12, 2021
4d82a3c
Possibility to disable global search in backend (#1532)
fballiano May 12, 2021
4bfd347
add redis as a valid option for global/session_save (#1513)
rjocoleman May 12, 2021
7914f77
Set proper HTTP response code on error (#1499)
woutersamaey May 12, 2021
0b25d96
steamClose doenst void this->_streamHandler in php8 (#1623)
fballiano May 17, 2021
4567901
(BC) Removed IE compatibility (#1073)
luigifab May 19, 2021
87c03d7
Update index.php (#1523)
fballiano May 28, 2021
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
8 changes: 4 additions & 4 deletions app/Mage.php
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ public static function getOpenMageVersion()
*/
public static function getOpenMageVersionInfo()
{
$majorVersion = 19;
$majorVersion = 20;

/**
* This code construct is to make merging for forward porting of changes easier.
@@ -236,9 +236,9 @@ public static function getOpenMageVersionInfo()
}

return array(
'major' => '20',
'minor' => '0',
'patch' => '7',
'major' => '19',
'minor' => '4',
'patch' => '12',
'stability' => '', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
);
You are viewing a condensed version of this merge commit. You can view the full changes here.