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 4.6.x patches back to main branch #18508

Merged
merged 19 commits into from Dec 16, 2021
Merged

Conversation

justinvelluppillai
Copy link
Contributor

Description:

Merge next_release branch back to 4.x-dev to release a 4.7.0 beta

Review

bx80 and others added 19 commits November 17, 2021 09:04
* Aligned evolution trend icons, text tweak

* Update plugins/MultiSites/angularjs/dashboard/dashboard.directive.less

Co-authored-by: Stefan Giehl <stefan@matomo.org>
* feedback plugin may not be loaded

* fix copy paste

* async/await not supported

* built UMDs
* use jQuery click for expand on click

* undo submodule change
* Use separate div in modals to display notifications otherwise Vue will erase modal content when initializing NotificationGroup component.

* built vue files
* viewDate ref is not kept up to date

* rebuild corehome
…18419)

* emit/broadcast on correct scope in wrapper

* rebuild vue
* Ensure UTF8mb4 conversion command always enables tracking again

* apply review feedback

* small code improvement
@justinvelluppillai justinvelluppillai added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Dec 16, 2021
@justinvelluppillai justinvelluppillai merged commit 8f8511c into 4.x-dev Dec 16, 2021
@justinvelluppillai justinvelluppillai deleted the next_release branch December 16, 2021 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants