Commit graph

33384 commits

Author SHA1 Message Date
Robin Townsend
400917623c Make myself the copyright holder for forward dialog code
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
Robin Townsend
88e0e9b9fb Merge branch 'develop' into improved-forwarding-ui 2021-05-24 08:23:07 -04:00
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Robin Townsend
cd460a2555 Adjust forward dialog copy
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:59:13 -04:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
Michael Telatynski
35b9388fc2 Iterate PR 2021-05-21 13:37:21 +01:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Germain
71f806346c
Merge pull request #6078 from robintown/remove-logo-spinner
Remove logo spinner
2021-05-21 09:29:23 +01:00
Robin Townsend
332412782e Remove logo spinner
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Michael Telatynski
d0d56d4b42
Merge pull request #6073 from matrix-org/t3chguy/fix/17412
Fix add reaction prompt showing even when user is not joined to room
2021-05-20 21:00:10 +01:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners
Vectorize spinners
2021-05-20 13:31:35 -06:00
Michael Telatynski
aca29c5577
Merge pull request #6077 from matrix-org/t3chguy/fix/17414
Fix handling of via servers for suggested rooms
2021-05-20 20:24:18 +01:00
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Travis Ralston
0fb77f5cb2
Merge pull request #6075 from matrix-org/travis/ce-def-rl
Upgrade showChatEffects to room-level setting exposure
2021-05-20 12:50:36 -06:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain
fff849c611
Merge pull request #6071 from matrix-org/gsouquet/roomview-deadcode
Delete RoomView dead code
2021-05-20 17:10:57 +01:00
Travis Ralston
018a75ea1e
Upgrade showChatEffects to room-level setting exposure 2021-05-20 09:10:21 -06:00
J. Ryan Stinnett
e07e7cf8d2
Merge pull request #6074 from matrix-org/jryans/test-noise
Reduce noise in tests
2021-05-20 13:50:37 +01:00
J. Ryan Stinnett
bee1a88f0b Reduce noise in tests
This disables a common log message to cut down the test log size and make it
easier to read messages specific to each test.
2021-05-20 13:42:36 +01:00
Michael Telatynski
dab75f9b88 Fix add reaction prompt showing even when user is not joined to room 2021-05-20 12:20:53 +01:00
Michael Telatynski
35710da174
Merge pull request #6069 from matrix-org/t3chguy/fix/17386
Fix room name issues in right panel summary card
2021-05-20 12:08:33 +01:00
Germain
106ff06fa2
Merge pull request #6072 from matrix-org/gsouquet/cache-normalized-name 2021-05-20 11:12:13 +01:00
Germain Souquet
422740f13b normalize displayName 2021-05-20 11:04:17 +01:00
Germain Souquet
83e2461155 call matches with normalized name 2021-05-20 10:57:20 +01:00
Germain Souquet
66ffaf945f Cache normalized room name 2021-05-20 10:43:57 +01:00
Germain
49c853a304 Delete RoomView dead code 2021-05-20 09:37:33 +01:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski
a61e977b5f Fix room directory ts migration 2021-05-19 19:30:56 +01:00
Michael Telatynski
8b67cdb80b Pre-populate create room dialog name when going from room directory 2021-05-19 19:20:58 +01:00
Michael Telatynski
b3aade075d Convert CreateRoomDialog to Typescript 2021-05-19 19:18:28 +01:00
Michael Telatynski
d10a45c6a3 Convert RoomDirectory and NetworkDropdown to Typescript 2021-05-19 18:40:03 +01:00
Robin Townsend
6cb6c7f3d0 Combine forward dialog room and DM lists
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-19 13:33:48 -04:00
Robin Townsend
83224dc7b6 Ensure forward list room decorations are aligned
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-19 13:32:27 -04:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite
Update MemberList to reflect changes for invite permission change
2021-05-19 17:35:58 +01:00
Michael Telatynski
f52dc9a3ea Fix room name not updating whilst summary card is open 2021-05-19 17:12:31 +01:00
Michael Telatynski
abd290938a Fix room name not wrapping in summary card 2021-05-19 17:12:25 +01:00
Michael Telatynski
b252005778
Merge pull request #6067 from matrix-org/t3chguy/spaces-0-subrooms
Show subspace rooms count even if it is 0 for consistency
2021-05-19 15:41:30 +01:00
J. Ryan Stinnett
309c31d1c3
Merge pull request #6068 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-05-19 13:53:24 +01:00
Weblate
ad951be843 Merge branch 'origin/develop' into Weblate. 2021-05-19 12:35:55 +00:00
Hivaa
0a018500e2 Translated using Weblate (Persian)
Currently translated at 21.0% (625 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-19 12:35:52 +00:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f Update MemberList.js 2021-05-19 17:46:10 +05:30
Michael Telatynski
6e25e42e66 Show subspace rooms count even if it is 0 for consistency 2021-05-19 13:00:46 +01:00
Michael Telatynski
a9d0699488
Merge pull request #6062 from matrix-org/t3chguy/fix/17280
Show DMs in space for invited members too, to match Android impl
2021-05-19 12:41:46 +01:00
Michael Telatynski
88d3706c04 mock getMembers on mkStubRoom 2021-05-19 12:34:27 +01:00
Michael Telatynski
f985918859
Merge pull request #6057 from matrix-org/t3chguy/fix/17350
Support filtering by alias in add existing to space dialog
2021-05-19 12:29:00 +01:00
Michael Telatynski
bde95e313d
Merge pull request #6064 from matrix-org/t3chguy/fix/rs5084
Fix issue when a room without a name or alias is marked as suggested
2021-05-19 12:28:41 +01:00
Michael Telatynski
9b01e1575d
Merge pull request #6055 from matrix-org/t3chguy/fix/17332
Fix space room hierarchy not updating when removing a room
2021-05-19 12:28:11 +01:00
J. Ryan Stinnett
d597781919
Merge pull request #6060 from matrix-org/revert-6024-travis/roomlist-corruption
Revert "Try putting room list handling behind a lock"
2021-05-19 12:25:44 +01:00