Merge 7.87.0 #24
Merged
Merge 7.87.0 #24
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
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Co-authored-by: Scott Nonnenberg <scott@signal.org>
…atedAt Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Co-authored-by: Jim Gustafson <jim@signal.org>
Co-authored-by: Scott Nonnenberg <scott@signal.org>
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Co-authored-by: yash-signal <yash@signal.org>
Co-authored-by: yash-signal <yash@signal.org>
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
Co-authored-by: yash-signal <yash@signal.org>
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
- Updated @signalapp/libsignal-client from 0.86.9 to 0.86.12 - Kept observer-vault branding and version 7.87.0 - Kept @lockdown-systems/ringrtc fork (not @signalapp/ringrtc) - Preserved Observer Vault customizations: - Challenge handler for registration captcha - Disabled call quality survey - Accepted upstream improvements: - Pinned messages improvements - getMessageByAuthorAciAndSentAt now supports includeEdits option - Animation improvements for PinnedMessagesBar
- scripts/merge-upstream.sh: Main merge helper script - Auto-accepts upstream for locale files and generated files - Auto-applies Observer Vault branding to package.json - Removes @signalapp/ringrtc (we use our fork) - Lists remaining conflicts for manual review - scripts/fix-ringrtc-imports.sh: Quick fix for RingRTC imports - Replaces @signalapp/ringrtc with @lockdown-systems/ringrtc - scripts/audit-customizations.sh: Lists all customized files - Files with @lockdown-systems/ringrtc imports - Files with Observer Vault comments - Custom observervault modules - docs/UPSTREAM-MERGE-GUIDE.md: Complete merge documentation - Lists all Observer Vault customizations - Explains auto-accept vs manual review files - Provides merge process checklist - Troubleshooting guide
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
This merges Signal Desktop 7.87.0.