OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into t3chguy/update-twemoji-colr

t3chguy/update-twemoji-colr
Michael Telatynski 2024-11-26 14:42:19 +00:00 committed by GitHub
parent f2c59cf2f2 de820e11fc
commit 5b5453794f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/release.yml vendored
View File

@ -18,6 +18,7 @@ jobs:
permissions: permissions:
contents: write contents: write
issues: write issues: write
pull-requests: read
secrets: secrets:
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

3
src/components/views/rooms/EventTile.tsx
View File

@ -757,6 +757,9 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
case EventShieldReason.MISMATCHED_SENDER_KEY: case EventShieldReason.MISMATCHED_SENDER_KEY:
shieldReasonMessage = _t("encryption|event_shield_reason_mismatched_sender_key"); shieldReasonMessage = _t("encryption|event_shield_reason_mismatched_sender_key");
break; break;
default:
shieldReasonMessage = _t("error|unknown");
} }
if (this.state.shieldColour === EventShieldColour.GREY) { if (this.state.shieldColour === EventShieldColour.GREY) {