[bot] Merge 25.3 to 25.5 (Conflicts) #547
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
- Added configuration page for Bluesky Settings under Panorama Public Admin Console. This can be used to configure the following: -- Credentials for both primary and test Bluesky accounts -- Provide the Bluesky API endpoint URLs for login, posting, and image upload -- Specify default hashtags for posts -- Upload a default Panorama logo (overridden by a dataset’s catalog entry image, if available) -- "Auto‑post" toggle (off by default) to enable automatic posting when a submitter makes a dataset public - Added "Post to Bluesky" menu item to the TargetedMSExperimentWebPart. This allows admins to create a post for the dataset to either the primary or test account. - When “auto‑post” is enabled, a Bluesky post is created immediately after a dataset is made public - Store generated Bluesky post URLs to a property store, linked to each dataset’s short URL - Register PanoramaPublicLogoResourceType attachment type in PanoramaPublicModule.java
cnathe
force-pushed
the
25.5_fb_bot_merge_25.3
branch
from
29ab992 to
ad1d5a9
Compare
Contributor
|
@labkey-jeckels @vagisha There was a large set of conflicts in the merge forward of 25.3 to 25.5 in this PR. They were all in the PanoramaPublicController.java class and all related to LinkBuilder and ButtonBuilder. Can you review the diff in this PR to make sure I resolved those conflicts correctly? |
Collaborator
PanoramaPublicController.java looks OK to me. Thanks for handling all the conflicts @cnathe |
vagisha
approved these changes
May 6, 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.3into25.5_fb_bot_merge_25.3and 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=25.5_fb_bot_merge_25.3