fix: update captions to reflect the menus below (v40) [DHIS2-12655] #2038
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…1684) Related to: https://dhis2.atlassian.net/browse/DHIS2-14282 We now use the same Earth Engine dataset for both total population and age/gender groups. This ensures that the total population numbers are the same.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
* fix: loading logic * fix: hide stateful selects to preserve state * chore: format * chore: update snapshots
Automatically merged.
Automatically merged.
Automatically merged.
Automatically merged.
…is selected (#2004) Fixes https://dhis2.atlassian.net/browse/DHIS2-17071 The code will check if the "Import as associated geometry" is checked. If so, then the validator for that will run. Otherwise, it will not run the validator
Automatically merged.
feat: update the query to filter programs by program type
fix: fix typeError that crashes app when job overview is clicked
Automatically merged.
Automatically merged.
|
@benguaraldi Should this be closed/removed? As the ticket did get merge to both v40 and master and this one states v40, but it's into master... I verified successfully, so it seems like this may not be necessary. |
|
@linadhis2 Yes, this PR is very wrong and is replaced by #2039, which has been merged, as you noted. I'm not sure what the best practice is—should I close this and then delete the branch? Or something else? |
|
@benguaraldi : we can just close this as it was replaced with your other PR |
|
@tomzemp Thanks! And thanks for your other help too! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attempting to backport #1977, which fixes the captions in the main menu and elsewhere in the Import/Export app so that they reflect the file formats that are found within.
Discussion of this between @cooper-joe and I can be found at:
https://dhis2.atlassian.net/browse/DHIS2-12655