This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Sourcemaps: develop -> feature branch #3817
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
Migrate key backups to SSSS
Migrate away from React Legacy contexts API
In the UserInfo panel. This means we now use cross-signing verifications in the UserInfoPanel so we can see our cross-signing verifications working! Lots more to do here: the remaining device.isVerified() calls in UserInfoPanel are where it needs to be switched to verifying users rather than devices, and of course we need to replace all the calls to device.isVerified() with checkDeviceTrust everywhere else.
Which is more in keeping with the designs (and we can do this now that the new user info panel is only enabled with cross signing).
Signed-off-by: Michael Telatynski <[email protected]>
Switch to using checkDeviceTrust
Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
Don't show the 'verify' button if the user is verified
Currently translated at 77.8% (1556 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
Currently translated at 33.8% (677 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
Fix room list filtering weird case sensitivity
….com/matrix-org/matrix-react-sdk into t3chguy/tags_changes � Conflicts: � src/components/views/elements/TagTile.js
Add alt="" to presentational images
Currently translated at 97.0% (1940 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
…r-lists/4.5.5-paste
…-lists/4.5.5-paste
…_in_og-description Render encoded html entities in og:description
Co-Authored-By: Travis Ralston <[email protected]>
….com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody � Conflicts: � yarn.lock
Signed-off-by: Michael Telatynski <[email protected]>
Change ref handling in TextualBody to prevent it parsing generated nodes
…poser Wire up the invite targets dialog to a real composer and show selections
…pids Support 3PIDs (email addresses) in the invite dialog
…-paste Support pasting a bunch of identifiers into the invite dialog
We removed the emojistrip script
Many imports were removed as part of refactoring work, so here we are.
RoomContext was pulled out to its own file.
Didn't manually handle this conflict, just let yarn do its thing.
turt2live
force-pushed
the
travis/sourcemaps-develop
branch
from
981a056 to
135c842
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
RIP notifications, and the diff.
Based on #3816
Real diff (from intentional conflict chunks merge) starts at a0da132
The conflict chunks were left unresolved in the merge commit to hopefully highlight the changes for review. Because they're a bit weird, I'm asking for a review to make sure that the new import method makes sense still (even after all the other PRs regarding imports have been merged).
This is against the feature branch until the feature branches from the other layers can safely go to develop.