[bot] Merge 25.11 to develop (Conflicts) #585
Merged
Conversation
This file contains hidden or 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
- Removed public account details from the "Download Data" webpart - Added text about WebDAV downloads requiring an account on PanoramaWeb. - Added a note about contacting the PanoramaWeb team before initiating very large downloads via WebDAV
- Do not send private data reminders for datasets that may have been resubmitted and are pending copy. - Fix NPE in `PrivateDataReminderJob` when a submitted experiment has no associated `announcementId`. - Allow re-submitting data that is already public but not yet published in a peer-reviewed journal e.g., manuscript is on pre-print servers like bioRxiv or medRxiv. - Removed logic that prevented making data public when full publication details were entered at submission time but the data was kept private. - Include experiment title in the private data reminder message - Updated `PanoramaPublicMakePublicTest` to verify that data pending copy cannot be made public by entering the MakePublicAction URL in the browser
…al project) in the copy experiment form. (#582) - Set the root of the tree store to the journal (Panorama Public) project. - Panorama Public datasets are organized into yearly subfolders. Pre-select the current year's subfolder, if it exists
labkey-danield
force-pushed
the
fb_bot_merge_25.11
branch
from
f9e8ed8 to
63a78ba
Compare
labkey-danield
approved these changes
Nov 25, 2025
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.
Automatic merge failed! Please merge
25.11intofb_bot_merge_25.11and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_25.11