Michael Telatynski
|
d8acc0612a
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
Conflicts:
src/components/views/rooms/EditMessageComposer.js
src/components/views/rooms/SendMessageComposer.js
|
2021-05-24 21:57:38 +01:00 |
|
RiotRobot
|
7123abc122
|
Reset matrix-js-sdk back to develop branch
|
2021-05-24 17:26:24 +01:00 |
|
RiotRobot
|
f8ef2d42f5
|
Resetting package fields for development
|
2021-05-24 17:25:58 +01:00 |
|
RiotRobot
|
29dfd5d862
|
Merge branch 'master' into develop
|
2021-05-24 17:25:42 +01:00 |
|
RiotRobot
|
9b633be908
|
Merge branch 'release-v3.22.0'
|
2021-05-24 17:21:45 +01:00 |
|
RiotRobot
|
fbc01d4930
|
v3.22.0
|
2021-05-24 17:20:31 +01:00 |
|
RiotRobot
|
d0e41c6461
|
Prepare changelog for v3.22.0
|
2021-05-24 17:20:30 +01:00 |
|
RiotRobot
|
ad30e89967
|
Upgrade matrix-js-sdk to 11.1.0
|
2021-05-24 17:15:16 +01:00 |
|
J. Ryan Stinnett
|
d35b0a32c7
|
Merge pull request #6087 from matrix-org/jryans/olm-3.2.3-release
[Release] Bump libolm version
|
2021-05-24 16:49:38 +01:00 |
|
Hubert Chathi
|
140258d3d6
|
bump to olm 3.2.3
|
2021-05-24 16:29:54 +01:00 |
|
Hubert Chathi
|
73221e4d08
|
Bump libolm version.
|
2021-05-24 16:29:54 +01:00 |
|
J. Ryan Stinnett
|
53e065d638
|
Merge pull request #6080 from uhoreg/olm_3.2.2
Bump libolm version.
|
2021-05-24 16:22:20 +01:00 |
|
Hubert Chathi
|
a0b052d3de
|
bump to olm 3.2.3
|
2021-05-24 11:11:45 -04:00 |
|
Nique Woodhouse
|
153d0ae66d
|
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui
Improve styling of the message action bar
|
2021-05-24 13:30:27 +01: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 |
|
Hubert Chathi
|
4012208669
|
Bump libolm version.
|
2021-05-21 16:09:28 -04:00 |
|
Michael Telatynski
|
35b9388fc2
|
Iterate PR
|
2021-05-21 13:37:21 +01: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 |
|
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 |
|
Germain
|
289867ff04
|
Merge pull request #6065 from matrix-org/gsouquet/roomview-dead-code
Delete RoomView dead code
|
2021-05-19 15:51:51 +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 |
|
RiotRobot
|
10bc96dc37
|
v3.22.0-rc.1
|
2021-05-19 14:40:37 +01:00 |
|
RiotRobot
|
cde23ab6e8
|
Prepare changelog for v3.22.0-rc.1
|
2021-05-19 14:40:36 +01:00 |
|
RiotRobot
|
7d0f3b0d99
|
Upgrade matrix-js-sdk to 11.1.0-rc.1
|
2021-05-19 14:33:21 +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 |
|