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.

Sign up for GitHub

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

Jump to bottom

fix: reorder options for consistency (DHIS2-9004) (519b0ba) v34 #1211

Merged
merged 2 commits into from
Aug 25, 2020
Merged

fix: reorder options for consistency (DHIS2-9004) (519b0ba) v34 #1211

merged 2 commits into from
Aug 25, 2020

Conversation

martinkrulltott
Copy link
Contributor

Backport #1153 for v34

Regenerated the pot file in a separate commit.

  • Removes two incorrect fields in Style tab and adds missing section titles (areaConfig, lineConfig), as per DHIS2-9004
  • Moves ShowData from Data to Style (areaConfig, lineConfig, stackedColumnConfig)
  • Adds missing section splitting in the Data tab (areaConfig, lineConfig)
  • Changes the label const to instead use the getLabel function (areaConfig, lineConfig)

edoardo
edoardo approved these changes Aug 25, 2020
View reviewed changes
Copy link
Member

@edoardo edoardo left a comment

Choose a reason for hiding this comment

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

LGTM

@martinkrulltott martinkrulltott merged commit 8c59852 into 34.x Aug 25, 2020
@martinkrulltott martinkrulltott deleted the fix/DHIS2-9004-options-placement-v34 branch August 25, 2020 07:56
dhis2-bot added a commit that referenced this pull request Aug 25, 2020
@dhis2-bot
chore(release): cut 34.6.14 [skip ci]
869d96f 
## [34.6.14](v34.6.13...v34.6.14) (2020-08-25)

### Bug Fixes

* change help text for aggregation type ([#1151](#1151)) ([#1209](#1209)) ([b9c3519](b9c3519))
* Decimals and Steps options only allow positive values (DHIS2-9002, DHIS2-9194) ([#1161](#1161)) v34 ([#1210](#1210)) ([b099607](b099607))
* reorder options for consistency (DHIS2-9004) (519b0ba) v34 ([#1211](#1211)) ([8c59852](8c59852))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 34.6.14 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edoardo edoardo edoardo approved these changes

Assignees
No one assigned
Labels
released on @34.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@martinkrulltott @dhis2-bot @edoardo