Oce 546 - Merge Nandi portal features to main OcPortal #1028
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
# Conflicts: # persistence/src/main/java/org/devgateway/toolkit/persistence/dao/categories/Supplier.java
…delete-alerts-elgeyo
…lete-alerts-elgeyo
OCMAKU-914 Register OCDS prefix for Elgeyo with OCP (Elgeyo)
…AKU-748-import-elgeyo
…-contract-locations-map-elgeyo # Conflicts: # persistence/src/main/resources/fm/charts.yml
OCMAKU-1017 Reducing the window to a certain level cuts off parts of the system (elgeyo)
OCMAKU-1004 Fix plotly display of donut charts on mobile phones (elgeyo)
…geyo # Conflicts: # forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/BaseStyles.css
Merge develop core into develop elgeyo
…react-router-elgeyo
OCMAKU-986-delete-alerts-error-elgeyo
Develop into master before 2.0.8
…curing-entity-elgeyo
…elgeyo OCMAKU-1016 procuring entity (elgeyo)
…react-router-elgeyo
…-contract-locations-map-elgeyo
Merge pull request #12 from devgateway/main-OCNANDI-11
…d by Tender date filter
OCNANDI-24 OCNANDI-25
OCNANDI-26 Dashaboard - Month filter wrong behavior
develop into main
…ent - improve error message
…ent - remove technical error message if error has message attached
…-plan-import-msg OCNANDI-28 Cannot upload procurement plan for Lands, Physical department - improve error message
…ll-rows OCNANDI-29 Make procurement plan excel import more resilient to empty…
…an error - change of urls on frontend and adjusted security to make new swagger work for public users
OCNANDI-32 OCNANDI-31
OCNANDI-33 Weekly scheduld OCDS convertor no longer works
brianbrix
changed the title
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.