Merged from staging for v2.9 release #157
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
Conflicts: src/main/java/fr/cirad/web/controller/gigwa/GigwaRestController.java
Reorganized JSP structure to avoid duplicate AppConfig bean declaration
Merge from master
Merge from master
Solved issues with individuals' selection for IGV display
Merge from master
* Added means to customize look * Merge from master (#114) * Moved standalone IGV download link to "Online output tools" dialog * added OAuth token compatibility for API requests, based on an OIDC discovery file (#112) Co-authored-by: GuilhemSempere <[email protected]> * Revert "added OAuth token compatibility for API requests, based on an OIDC discovery file (#112)" This reverts commit a899c7f. --------- Co-authored-by: Peter Selby <[email protected]> * Merge from master (#119) * Moved standalone IGV download link to "Online output tools" dialog * added OAuth token compatibility for API requests, based on an OIDC discovery file (#112) Co-authored-by: GuilhemSempere <[email protected]> * Revert "added OAuth token compatibility for API requests, based on an OIDC discovery file (#112)" This reverts commit a899c7f. * Caching unzoomed results for fast zoom resets ... also reduced dot size and set default number of intervals to 1000 * Fixed dialog height (set to maximum for all) --------- Co-authored-by: Peter Selby <[email protected]> --------- Co-authored-by: Peter Selby <[email protected]>
This reverts commit 9845774.
* Provided means to customize the UI (Windows update script not tested yet) * Fixed Windows update script
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.