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

set default color value, when key not exist. #18696

Merged
merged 2 commits into from Jan 28, 2022
Merged

Conversation

peterhashair
Copy link
Contributor

Description:

Fixes: #18534
set default color value, when key not exist.

Review

Peter added 2 commits January 28, 2022 12:40
add addition setup
update foreach to array_merge
@peterhashair peterhashair changed the title Update Sparkline.php set default color value, when key not exist. Jan 28, 2022
@peterhashair peterhashair added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Jan 28, 2022
Copy link
Member

@tsteur tsteur left a comment

Choose a reason for hiding this comment

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

Looks good to merge and doesn't look like any of the test failures are related to this change

@peterhashair peterhashair merged commit 8ae9c53 into 4.x-dev Jan 28, 2022
@peterhashair peterhashair deleted the m-18534-fix-color branch January 28, 2022 01:29
@sgiehl
Copy link
Member

sgiehl commented Jan 28, 2022

was this merged to 4.x-dev on purpose, or should that fix have been in next_release?

@peterhashair
Copy link
Contributor Author

@sgiehl right, maybe should be in next_release. should I do a cherry pick on next_release

@tsteur
Copy link
Member

tsteur commented Jan 31, 2022

@peterhashair yes that be great, thanks

peterhashair pushed a commit that referenced this pull request Jan 31, 2022
* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge
peterhashair pushed a commit that referenced this pull request Jan 31, 2022
* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge
peterhashair pushed a commit that referenced this pull request Jan 31, 2022
* set default color value, when key not exist. (#18696)

* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge

* set default color value, when key not exist. (#18696)

* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge
@sgiehl sgiehl modified the milestones: 4.7.0, 4.8.0 Jan 31, 2022
@sgiehl sgiehl removed the Needs Review PRs that need a code review label Jan 31, 2022
peterhashair added a commit that referenced this pull request Feb 2, 2022
* set default color value, when key not exist. (#18696)

* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge

* Update Notification.vue

quick fix

* built vue files

Co-authored-by: peterhashair <peterhashair@users.noreply.github.com>
peterhashair pushed a commit that referenced this pull request May 12, 2022
* set default color value, when key not exist. (#18696)

* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge

* protected getPluginUmdChunks

update private to protect
justinvelluppillai added a commit that referenced this pull request May 16, 2022
* tweak QueryParameters type in index.d.ts to better match arbitrary object types (#19191)

* tweak QueryParameters type in index.d.ts to better match arbitrary object types

* make sure github action takes into account changes in CoreVue types

* add ability to use a deep watch in scope var watches in angularjs adapters (#19195)

* covert getPluginUmdChunks from private to protected (#19212)

* set default color value, when key not exist. (#18696)

* Update Sparkline.php

add addition setup

* Update Sparkline.php

update foreach to array_merge

* protected getPluginUmdChunks

update private to protect

* correctly destroy vue entry components in widgetloader (#19216)

* Release Matomo 4.10.0

Co-authored-by: dizzy <diosmosis@users.noreply.github.com>
Co-authored-by: Peter Zhang <peter@innocraft.com>
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.

Fatal error rgument 1 passed to Davaxi\\Sparkline::setLineColorHex() must be of the type string when comparing
3 participants