Skip to content

fix/GGW/GGW-issues - #4475

Merged
jdeanquin-dg merged 28 commits into
future/v4.0from
fix/GGW/GGW-issues
Jul 14, 2026
Merged

fix/GGW/GGW-issues#4475
jdeanquin-dg merged 28 commits into
future/v4.0from
fix/GGW/GGW-issues

Conversation

@brianbrix

Copy link
Copy Markdown
Contributor

No description provided.

# Conflicts:
#	amp/src/main/java/org/digijava/module/aim/helper/GlobalSettingsConstants.java
#	amp/src/main/resources/xmlpatches/4.0/AMP-31057-Add-Currecies-for-dashboard.xml
#	amp/src/main/resources/xmlpatches/4.0/AMP-31057-Donor-Funding-Admin-Levels-v1.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_0.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_1.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_2.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_3.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_4.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_5.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_6.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_7.xml
#	amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_8.xml
#	amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_2.xml
#	amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_3.xml
#	amp/src/main/webapp/WEB-INF/jsp/esrigis/view/mainmapPopup.jsp
Missing gazeteer
@brianbrix
brianbrix force-pushed the fix/GGW/GGW-issues branch from 680e77c to 0ed93d1 Compare May 14, 2026 18:34
@brianbrix
brianbrix force-pushed the fix/GGW/GGW-issues branch from 375b4c3 to 04fbc87 Compare May 15, 2026 05:21
@jdeanquin-dg
jdeanquin-dg merged commit 37c81be into future/v4.0 Jul 14, 2026
2 checks passed
@jdeanquin-dg
jdeanquin-dg deleted the fix/GGW/GGW-issues branch July 14, 2026 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants