Skip to content

Commit 9ace19c

Browse files
justinvelluppillaibx80sgiehldiosmosismattab
authored
Merge fixes made to latest release back (matomo-org#18406)
* Fix for misaligned evolution trend icons (matomo-org#18323) * Aligned evolution trend icons, text tweak * Update plugins/MultiSites/angularjs/dashboard/dashboard.directive.less Co-authored-by: Stefan Giehl <[email protected]> * Hide feedback banner in zen mode (matomo-org#18329) * [Vue] 4.6.0 fixes (matomo-org#18334) * feedback plugin may not be loaded * fix copy paste * async/await not supported * built UMDs * [Vue] use jQuery click for expand on click (matomo-org#18341) * use jQuery click for expand on click * undo submodule change * 4.6.0-rc2 * [Vue] fix modal notification placement (matomo-org#18377) * Use separate div in modals to display notifications otherwise Vue will erase modal content when initializing NotificationGroup component. * built vue files * Updating version to 4.6.0 * [Vue] date picker viewDate property is not kept up to date (matomo-org#18385) * viewDate ref is not kept up to date * rebuild corehome * built vue files Co-authored-by: Ben Burgess <[email protected]> Co-authored-by: Stefan Giehl <[email protected]> Co-authored-by: dizzy <[email protected]> Co-authored-by: Matthieu Aubry <[email protected]> Co-authored-by: justinvelluppillai <[email protected]>
1 parent 0061789 commit 9ace19c

File tree

16 files changed

+165
-123
lines changed

16 files changed

+165
-123
lines changed

core/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class Version
2020
* The current Matomo version.
2121
* @var string
2222
*/
23-
const VERSION = '4.6.0-rc2';
23+
const VERSION = '4.6.0';
2424

2525
const MAJOR_VERSION = 4;
2626

plugins/CoreHome/stylesheets/zen-mode.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#root #secondNavBar + .pageWrap {
1111
margin-left: 0;
1212
}
13+
14+
.bannerHeader {
15+
display: none;
16+
}
1317
}
1418

1519
#content:not(.admin), .widget, .ui-widget {

plugins/CoreHome/vue/dist/CoreHome.umd.js

Lines changed: 33 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)