merge develop into latest to release 3.1 #934
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
change the name of this step and fetch all commits
* Add reference documentation for the globus_endpoints parameter, to enable the Globus button (OSC/ondemand#2858) * Updated with new format of globus_endpoints property * Add an example using the home directory of the current user * use etc instead of currentuser Etc.getpwnam(Etc.getlogin).dir is safer to use than currentuser at the moment. --------- Co-authored-by: David Kelly <davidkelly@uchicago.edu> Co-authored-by: Jeff Ohrstrom <johrstrom@osc.edu>
Sync develop branch with latest resolving merge conflicts.
Add docs on motd_render_html.
Update release notes for 3.1. This adds: * adds globus to the release notes * adds documentattion for path_selector. * add ga4 to release notes. * add dynamic checkboxes to release notes. * adds documentation for disabling uploads & downloads and adds it to the release notes. * add custom_javascript_files to release notes. * add docs for completed.html.erb and restructure this a bit to accommodate it.
* fix globus example * add custom directives to release notes
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.
https://osc.github.io/ood-documentation-test/develop/
With this merge, we'll release 3.1 documentation.