August Sprint - Resolved Merge Conflicts #373
Merged
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
[Issue 332]: Remove org person count from view
…n-chart [Issue 331]: Add description below analytics-charts
[Issue 335]: Apply theme color for Publications by Academic Age Group
…-logo [Issue 330]: Replace twitter logo with X svg
…ngular into august-sprint-333-department-column-select-merge
[Issue 336]: Adjust number of ticks on researcher scale
…ngular into august-sprint-336-merge
[Issue 336]: Fix max override and update researcher scale for academic age group visualization - merge conflicts resolved
…ngular into august-sprint-329-merge
[Issue 329]: Remove twitter widget and component - merge conflicts resolved
…umn-select-merge [Issue 333, Issue 334, Issue 345] Data and analytic view navigation update - merge conflicts resolved
[Issue 418]: Use organizations field to filter for academic age group
[Issue 355]: Update filters and i18n labels for data and analytic drop downs
…ngular into august-sprint-353-undefined-merge
[Issue 353]: Upgrade scholars-embed-utilities - merge conflicts resolved
…-filtering Academic age group sidebar filtering and max override removed
…atch [Issue 360]: Subscribe, reset search form and wait 500 before closing modal
[Issue 362]: Get applied filter badge label from originating facet
[Issue 363]: Prevent false positive filters query param check
…ngular into august-sprint-unsdg-organization-filter-merge
…-filter-merge Apply fixes and filter field updates to UNSDG data and analytic view - merge conflicts resolved
[Issue 368]: Fix navigation between co-author and co-investigator views
…august-sprint-staging-merge
[Issue 334]: Update data and analytics breadcrumbs
…ngular into august-sprint-staging-merge
Merged
wwtamu
changed the title
kaladay
approved these changes
Aug 21, 2024
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.
The sprint branch was unintentionally created from a local
tamu-mainbehind origin.