Future/v4.0 #4224
Open
Future/v4.0 #4224
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
Task/amp 30447/merge me module
GGW-121 fixed create indicator error
…e-tried-to-save-activity-with-M&E-info GGW-123 - fix error when we save an activity with indicator and values
…anization-manager GGW-127 - Exception in organization manager
Forcing the commit on data base.
Fix funding issue
Fix funding issue
Fix funding issue
GGW-130- cannot change organisation
Fix contacts issue
Fix contacts issue
Fix contacts issue
GGW-130- cannot change contacts
# Conflicts: # amp/WEB-INF/src/org/dgfoundation/amp/nireports/amp/AmpReportsSchema.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpConfiguration.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/FiltersEndpoint.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/EndPoints.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/FundingTypeChartData.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/gis/GisEndPoints.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/publicportal/PublicEndpoint.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/publicportal/PublicPortalService.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/publicportal/PublicTopData.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/scorecard/DonorScorecard.java # amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/scorecard/service/ScorecardService.java
Ggw/merge develop
Revert "Ggw/merge develop"
…merge_develop Revert "Revert "Ggw/merge develop""
…rator-urls Task/ggw 122/fix report generator urls
AMP-30863 fix menu entry
…-line-chart Task/amp 30819/fix y axis on line chart
…et-issue AMP-30813 updated code to handle global value indicators values
…ard-bug AMP-30906: Resolve ndd dash bug
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.
No description provided.