Commit graph

16021 commits

Author SHA1 Message Date
Dariusz Niemczyk
2c66403b3c Replace console.info with logger.info
Related https://github.com/vector-im/element-web/issues/18425
2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
5290afcc4c Replace console.warn with logger.warn
Related https://github.com/vector-im/element-web/issues/18425
2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
5e73a212f4 Replace console.error with logger.error
Related https://github.com/vector-im/element-web/issues/18425
2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
12632318ef Add missing parenthesis for await calls 2021-10-18 14:08:23 +02:00
Andy Balaam
13d6456200 Convert CryptographyPanel to a table 2021-10-18 09:36:16 +01:00
Andy Balaam
f05e35bd94
Merge pull request #6958 from andybalaam/separate-cryptography-setting-component
Break 'Cryptography' settings into a separate component
2021-10-18 09:34:55 +01:00
Michael Telatynski
6a23aee725 Swap order of private space creation and tweak copy 2021-10-18 09:30:57 +01:00
Michael Telatynski
c0d9c69f16 Fix leave space cancel button exploding 2021-10-18 09:22:44 +01:00
Michael Telatynski
4d63e1239b
Merge pull request #6962 from CicadaCinema/patch-3 2021-10-18 09:17:40 +01:00
Šimon Brandner
1935620e43
Convert emoticon to emoji at the end of a line on send even if the cursor isn't there
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-17 09:40:42 +02:00
CicadaCinema
a9c9e5b778 appease the linter 2021-10-16 14:58:10 +01:00
CicadaCinema
7b893366f2 Add spacing to Room settings - Notifications subsection 2021-10-16 14:52:29 +01:00
Rafael Goncalves
2fb802eb9e Move error message closer to password field
Signed-off-by: Rafael Goncalves <rafaelgoncalves@riseup.net>
2021-10-15 16:01:35 -03:00
Germain Souquet
5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread 2021-10-15 17:42:44 +01:00
Andy Balaam
0941b38b5d Name CryptographyPanel CSS classes consistent with style 2021-10-15 16:09:36 +01:00
Andy Balaam
a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Germain
495f824f0f
Merge pull request #6957 from matrix-org/gsouquet/fix-appearance-settings 2021-10-15 15:45:05 +01:00
Germain Souquet
ac23afe9f1 Allow EventTile to be rendered with mock events 2021-10-15 15:36:06 +01:00
Faye Duxovni
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons
Update the button styling on the emoji comparison dialog during cross-signing
2021-10-15 10:34:25 -04:00
Germain Souquet
93fc24c875 Adding renderThreadInfo comment to explain data accessor 2021-10-15 14:47:02 +01:00
Germain Souquet
904147b194 Merge branch 'develop' into gsouquet/fix-thread-root-hidden 2021-10-15 14:45:11 +01:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953)
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Andy Balaam
9c753765d5
Merge pull request #6955 from andybalaam/table-for-devicespanel
Switch DevicesPanel to use table (for screen readers)
2021-10-15 14:16:45 +01:00
Germain
f0ff3a26cc
Merge pull request #6954 from aaronraimist/download-tooltip 2021-10-15 11:57:39 +01:00
Andy Balaam
7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Aaron Raimist
8cdb1c667d Fix tooltip when downloading unencrypted file 2021-10-15 05:23:59 -05:00
Germain Souquet
6baa6c8f65 Listen to new thread to render info on timeline 2021-10-15 11:08:33 +01:00
Germain
af55ac7b8c
Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat
Add 'm.thread' relation to replies when replying to a threaded event
2021-10-15 10:27:40 +01:00
Germain Souquet
17c4cc91af Reconcile threads root with its children before displaying it 2021-10-15 10:26:04 +01:00
Germain Souquet
3dcf0d0b7e Fix incorrect logic to hide thread relations 2021-10-15 10:25:42 +01:00
Germain Souquet
99ad603d91 Merge branch 'develop' into gsouquet/threads-relations 2021-10-15 08:43:51 +01:00
Germain Souquet
5fccbd4ef7 Remove auto-import 2021-10-14 17:40:00 +01:00
Germain Souquet
378536ee2a Add 'm.thread' relation for replies to a threaded event 2021-10-14 17:22:06 +01:00
Germain Souquet
d315641056 Make threads use 'm.thread' relation 2021-10-14 17:04:27 +01:00
Dariusz Niemczyk
2dd6dddc67
Fix incorrect liveTimeline reference (#6948)
Fixes https://github.com/vector-im/element-web/issues/19400
2021-10-14 15:37:56 +00:00
Dariusz Niemczyk
562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Michael Telatynski
6bb47ec710
Merge pull request #6945 from matrix-org/t3chguy/fix/19390 2021-10-14 13:40:27 +01:00
Michael Telatynski
069a8d05f1 Space Room View should react to join rule changes down /sync 2021-10-14 12:06:24 +01:00
Michael Telatynski
020eca6922 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/rooms/MemberList.tsx
	src/components/views/rooms/RoomList.tsx
2021-10-14 11:05:29 +01:00
Michael Telatynski
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski
a37c10b256
Merge pull request #6920 from matrix-org/t3chguy/fix/17410 2021-10-14 09:58:45 +01:00
Michael Telatynski
53d7c9d2e5
Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1 2021-10-14 09:58:28 +01:00
Michael Telatynski
2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
Faye Duxovni
8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing
Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-14 00:46:15 -04:00
Travis Ralston
ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls
Add feature flag for polls and placeholder dialog
2021-10-13 11:28:53 -06:00
Travis Ralston
ad53662704 add comma 2021-10-12 15:26:22 -06:00
Travis Ralston
71c5b02390 Add feature flag for polls and placeholder dialog
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Travis Ralston
d99660d420 Add customisation point for visibility of invites and room creation
Fixes https://github.com/vector-im/element-web/issues/19331
2021-10-12 14:33:29 -06:00
Michael Telatynski
c141c740d8
Merge pull request #6928 from matrix-org/t3chguy/fix/18883 2021-10-12 17:51:45 +01:00
Michael Telatynski
4416212d0b
Merge pull request #6926 from matrix-org/t3chguy/fix/18231 2021-10-12 14:03:12 +01:00
Robin Townsend
c078e89f59 Remove semicolon from notifications panel
Signed-off-by: Robin Townsend <robin@robin.town>
2021-10-11 14:34:03 -04:00
Michael Telatynski
c28c62d9f1 Inhibit Unable to get validated threepid error during UIA 2021-10-11 14:43:55 +01:00
Michael Telatynski
c4d4229340 hide leave section if you aren't in the room instead of disabling 2021-10-11 13:50:34 +01:00
Michael Telatynski
11480e8641 Hide Skeleton UI if you have Suggested Rooms 2021-10-11 10:50:49 +01:00
Michael Telatynski
0d524ae70b Iterate invite your teammates to Space view 2021-10-11 10:43:37 +01:00
Dariusz Niemczyk
414b20f17e
Make thread button always visible (#6903)
Fix https://github.com/vector-im/element-web/issues/18956
2021-10-11 10:26:05 +01:00
Michael Telatynski
ccba7badff Make public space alias field mandatory again 2021-10-08 14:33:58 +01:00
James Salter
fe79a95731
Merge pull request #6918 from VFermat/fix-19316
Validate that the phone number verification field is filled before allowing user to submit
2021-10-08 14:12:28 +01:00
Michael Telatynski
8cb4454ea3 Disable leave room button if user isn't in the room e.g peeking 2021-10-08 13:43:06 +01:00
Michael Telatynski
111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
2021-10-08 13:00:20 +01:00
Michael Telatynski
2483f1dc90 Add progress bar to restricted room upgrade dialog 2021-10-08 12:20:43 +01:00
Michael Telatynski
5264b1db9d
Merge pull request #6906 from matrix-org/t3chguy/fix/19246 2021-10-08 10:36:48 +01:00
Logan Arnett
4759b4fb5d updating for lint issues 2021-10-07 14:58:35 -04:00
Vitor Eller
0b64dfa59a Alter phone verification button disable label 2021-10-07 15:23:54 -03:00
Logan Arnett
c56d6ba539 updating from boolean to object in order to track if more than one thing is edited 2021-10-07 13:22:43 -04:00
Paulo Pinto
6aa325ed54 Rename method to onRoomName
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-10-07 17:13:57 +01:00
Paulo Pinto
53f26d2744 Keep room name up-to-date in settings dialog
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-10-07 17:04:30 +01:00
Paulo Pinto
ea55b0d45f Add room name to component state
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-10-07 17:01:39 +01:00
Michael Telatynski
1b5aef4447
Merge pull request #6311 from matrix-org/t3chguy/a11y/focus-lock-ctx-menu 2021-10-07 13:28:32 +01:00
Michael Telatynski
5dfe53920c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19246 2021-10-07 13:20:06 +01:00
Michael Telatynski
e470d7d030 Make use of MatrixClient::getRoomUpgradeHistory 2021-10-07 13:19:51 +01:00
Michael Telatynski
675c587e03
Merge pull request #6911 from matrix-org/t3chguy/fix/19066 2021-10-07 11:22:01 +01:00
Michael Telatynski
1c8bcce0ed comment 2021-10-07 11:13:13 +01:00
Michael Telatynski
047f182cd8 focusLock only specific context menus 2021-10-07 11:04:10 +01:00
Michael Telatynski
ab98549fff move the logic to the parent so that the section hiding works 2021-10-06 17:08:32 +01:00
Michael Telatynski
4ac29a431c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19276 2021-10-06 16:53:39 +01:00
Michael Telatynski
b373b98d48 Simplify aria menu item roles/selectors 2021-10-06 16:49:53 +01:00
Michael Telatynski
a6c780674a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/focus-lock-ctx-menu
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-10-06 16:39:52 +01:00
Michael Telatynski
52d0b0133c Hide kick & ban options in UserInfo when looking at own profile 2021-10-06 14:46:39 +01:00
Michael Telatynski
79f3348986 Simplify and improve useRoomHierarchy hook 2021-10-06 10:27:16 +01:00
Michael Telatynski
fa800796c7 Respect tombstones in locally known rooms for Space children 2021-10-06 09:41:57 +01:00
Michael Telatynski
1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00
Faye Duxovni
651e943b31 Merge branch 'develop' into fayed/fix-verification-dialog 2021-10-05 08:48:52 -04:00
Faye Duxovni
9a16b4636f Make cross-signing dialog clearer and more context-aware
- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
  look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
  recovery keys exist, and add an option to reset cross-signing keys
  if necessary.
- Various minor clarifying adjustments to UI styling/text

Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-05 00:54:20 -04:00
Andrew Ferrazzutti
65e67003f3 Allow hiding "Sign Up" in the guest preview bar
Hide the button when "UIFeature.registration" is set to false in
Element's config.json.

Fixes https://github.com/vector-im/element-web/issues/19264

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-10-03 14:10:09 -04:00
Germain Souquet
597bfc9ca5 Rename changed variable 2021-10-01 15:10:32 +01:00
Germain Souquet
25896880ca Rename rendering context to timeline rendering type 2021-10-01 14:50:35 +01:00
Germain Souquet
94573568fd Add reply in thread hint to m.replace relations 2021-10-01 14:49:22 +01:00
Germain Souquet
65c7657e3c Pass replacingEventId for edits to appear in thread's view 2021-10-01 14:49:08 +01:00
Dariusz Niemczyk
1331e960fa
Add ability to properly edit messages in Threads. (#6877)
* Fix infinite rerender loop when editing message

* Refactor "edit_event" to Action.EditEvent

* Make up-arrow edit working in Threads

* Properly handle timeline events edit state

* Properly traverse messages to be edited

* Add MatrixClientContextHOC

* Refactor RoomContext to use AppRenderingContext

* Typescriptify test

Co-authored-by: Germain <germains@element.io>
2021-10-01 15:35:54 +02:00
Michael Telatynski
616dfaebc0
Merge pull request #6892 from matrix-org/t3chguy/ctx-menu-propagation 2021-10-01 12:26:53 +01:00
Michael Telatynski
898e4acb4f Don't let click events propagate out of context menus 2021-10-01 10:00:53 +01:00
Michael Telatynski
2c42946409
Merge pull request #6876 from matrix-org/t3chguy/fix/space-hierarchy-filter 2021-10-01 09:01:14 +01:00
Travis Ralston
fe0a68b71e
Merge pull request #6869 from SimonBrandner/task/src-ts
Convert `/src` to TS
2021-09-30 12:48:23 -06:00
Michael Telatynski
8ac77c498f Add progress bar to Community to Space migration tool
and invite-one-by-one to workaround Synapse ratelimits
2021-09-30 13:43:59 +01:00
Michael Telatynski
5eaf0e7e25
Merge pull request #6081 from jaiwanth-v/export-conversations 2021-09-30 12:49:24 +01:00
Michael Telatynski
6454aa7a95 Update copy 2021-09-30 11:46:05 +01:00
Michael Telatynski
0697470cc8 Update copy 2021-09-29 16:05:03 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski
ad5842c87a Allow closing Dropdown via its chevron 2021-09-29 14:24:12 +01:00
Michael Telatynski
d6cab320e9 Fix space invite edge cases 2021-09-29 14:04:02 +01:00
Richard van der Hoff
c99216814f fix lint 2021-09-29 11:20:51 +01:00
Richard van der Hoff
b285315cb8 Fix ScrollPanel.isAtBottom for non-standard DPI settings 2021-09-29 11:16:41 +01:00
Michael Telatynski
399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164 2021-09-29 10:05:43 +01:00
Michael Telatynski
02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Michael Telatynski
886f8d31fb Iterate title on confirm space action dialog 2021-09-28 16:23:42 +01:00
Michael Telatynski
0f8069ac35 Switch ConfirmUserActionDialog over to using a Field 2021-09-28 16:22:27 +01:00
Michael Telatynski
207a1143fc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-28 15:45:09 +01:00
Germain
ca3b8e596a
Merge pull request #6873 from matrix-org/gsouquet/threads-action-bar-19127 2021-09-28 15:07:36 +01:00
Dariusz Niemczyk
8331d4c7b7
Happily handle empty text messages (#6825)
This commig refactors the message-deletion modal and reuses it for case of removing
the entire message and trying to send it, which should trigger removal flow instead.

Fix vector-im/element-web#18873
2021-09-28 15:04:25 +01:00
Germain Souquet
c1165830ed Create rendering context enum for MessageActionBar 2021-09-28 14:55:00 +01:00
Michael Telatynski
7f63f496be delint 2021-09-28 14:03:41 +01:00
Michael Telatynski
ce0f16d58b Fix pagination when filtering space hierarchy 2021-09-28 13:52:30 +01:00
Germain Souquet
160bf8e21f Fix missing prop 2021-09-28 11:06:06 +01:00
Germain Souquet
e52a33e93c Merge branch 'develop' into gsouquet/threads-action-bar-19127 2021-09-28 09:34:43 +01:00
Travis Ralston
8e497f8c56
Merge pull request #6871 from psrpinto/fix/close-url-preview-button
Fix issue with preview panel close button not appearing for certain messages containing a URL
2021-09-27 13:42:11 -06:00
Paulo Pinto
432dd994bd Filter out invalid previews
The call to cli.getUrlPreview() might return an empty object ({}), which means
there is in fact no preview for that URL.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Paulo Pinto
dabc13c98f Extract logic to a function
For better readability of the call to useAsyncMemo()

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Šimon Brandner
e2b6c2cbd6
Convert RoomNotifs to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 18:39:57 +02:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787
Improve AUX panel behaviour
2021-09-27 10:16:05 -06:00
Michael Telatynski
c39519a753 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/spaces-admin-check 2021-09-27 13:46:51 +01:00
Šimon Brandner
30599554f1
Convert PageTypes to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 14:41:03 +02:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages (#6701)
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Michael Telatynski
6d0af83df4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/dialogs/LeaveSpaceDialog.tsx
	src/i18n/strings/en_EN.json
2021-09-27 11:19:49 +01:00
Šimon Brandner
0cba943f96
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:35:33 +02:00
Šimon Brandner
6a88ac900c
Merge remote-tracking branch 'upstream/develop' into task/messages-ts 2021-09-27 10:32:25 +02:00
Šimon Brandner
2712dde581
Remove empty line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:28:07 +02:00
Šimon Brandner
dd92f8f1f9
Move imports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:21:46 +02:00
Šimon Brandner
a1d5e7ba66
Add return type
Co-authored-by: Germain <germain@souquet.com>
2021-09-27 10:12:55 +02:00
Šimon Brandner
6aa5d98741
Remove constructor
Co-authored-by: Germain <germain@souquet.com>
2021-09-27 10:12:45 +02:00
Šimon Brandner
af9429c8a0
Convert ActiveWidgetStore to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 19:57:02 +02:00
Šimon Brandner
fb5c18caa0
Convert MKeyVerificationConclusion to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 14:51:46 +02:00
Šimon Brandner
c287d15fa0
Convert RoomCreate to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:42:29 +02:00
Šimon Brandner
421fa1ab69
Convert RoomAvatarEvent to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:42:28 +02:00
Šimon Brandner
ff1c1fbc78
Convert MjolnirBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:08:05 +02:00
Šimon Brandner
bee85a0bcd
Convert EditHistoryMessage to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:08:04 +02:00
Germain
79b52f8a22
Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989 2021-09-24 15:05:40 +01:00
David Baker
9f26cca256 Fix the User View
Extreme confusion between users and members, and presumably we were
passing one as the other and they were similar enough that it
worked.

UserView still makes fake member objects but this at least fixes
the user view in the right panel.

Fixes https://github.com/vector-im/element-web/issues/19158
2021-09-24 14:35:00 +01:00
Germain Souquet
8348add67f Add MessageActionBar to ThreadView 2021-09-24 14:19:11 +01:00
Germain Souquet
836e427dc8 Scope editor reset when reply changed for thread view 2021-09-24 11:13:57 +01:00
Germain Souquet
82d685e410 Only switch to ThreadPanel when roomId changes 2021-09-24 11:06:07 +01:00
Germain Souquet
070f279ae7 Close thread view when changing room 2021-09-23 14:44:03 +01:00
Germain Souquet
bd599c96a3 Add React lifecycle methods publicity and return types 2021-09-23 14:43:39 +01:00
Germain Souquet
a9f7ab785c Change CIDER state persistence key to cater for threads
Extending the CIDER state persistence to threads and make sure that SendMessageComposer can restore drafts for specific threads

This also prevents the thread's replyToEvent to leaking in the room composer
2021-09-23 10:59:33 +01:00
Jaiwanth
d1e3d35d40 Change export bundle filename format, light theme for all exports and import jszip after export cta 2021-09-22 22:17:23 +05:30
Germain
2cd5b731bf
Merge pull request #6851 from matrix-org/gsouquet/timeline-rendering-18719 2021-09-22 17:23:07 +01:00
Travis Ralston
7cd7cf87e3
Merge pull request #6853 from videogame-hacker/patch/undefined-3pids
Fix Notifications settings view when threepids is undefined
2021-09-22 10:22:58 -06:00
David Baker
f69854b274
Merge pull request #6856 from SimonBrandner/fix/soft-crash
Fix `AppsDrawer` soft crash
2021-09-22 14:56:00 +01:00
Šimon Brandner
96c16354ca
Fix soft crash
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-22 15:47:15 +02:00