Commit graph

33506 commits

Author SHA1 Message Date
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
Germain Souquet
3b69c0203c Remove resize notifier prop from RoomTile 2021-05-24 17:05:59 +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
Germain Souquet
fdc22bfdf7 Adhere to TypeScript codestyle better 2021-05-24 16:40:55 +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
Germain Souquet
0bbfb1a6d9 remove unused variable checkObjectHasNoAdditionalKeys 2021-05-24 16:18:55 +01:00
Hubert Chathi
a0b052d3de bump to olm 3.2.3 2021-05-24 11:11:45 -04:00
Germain Souquet
671f169457 Remove unused middlePanelResized event listener 2021-05-24 16:08:48 +01:00
Germain Souquet
f478cd98f7 fix i18n for UserMenu spinner 2021-05-24 15:12:17 +01:00
Germain Souquet
36d95ff737 Display spinner in user menu when joining a room 2021-05-24 15:02:26 +01:00
Germain Souquet
19569f3897 Convert Tooltip to TypeScript 2021-05-24 15:01:59 +01:00
Germain Souquet
b5295b03ce Trigger join room actions properly 2021-05-24 14:34:06 +01:00
Germain Souquet
d6bc1861ae Migrate InlineSpinner to TypeScript 2021-05-24 14:33:31 +01: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
J. Ryan Stinnett
44ecf62758 Add explicit member access 2021-05-21 13:15:54 +01:00
J. Ryan Stinnett
3b50808cb0 Use any instead of object 2021-05-21 13:11:33 +01:00
J. Ryan Stinnett
320c8d2091 Move function prop to bottom 2021-05-21 13:10:50 +01:00
J. Ryan Stinnett
e4cf66f0e4 Move state init to constructors 2021-05-21 13:09:24 +01:00
J. Ryan Stinnett
5d6f16ff64 Add explicit public 2021-05-21 12:59:54 +01:00
J. Ryan Stinnett
66077e3a05 Add spaces to imports 2021-05-21 12:57:51 +01:00
J. Ryan Stinnett
f8e61a982b One less Set 2021-05-21 12:41:59 +01:00
J. Ryan Stinnett
d59b2b3579 Fix unintended buttons class change 2021-05-21 12:38:32 +01:00
J. Ryan Stinnett
d0da4b2a25 Use separate name for verification request component 2021-05-21 12:37:34 +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
J. Ryan Stinnett
d9e490926b Add types to DevtoolsDialog 2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
df09bdf823 Add types to InteractiveAuthEntryComponents 2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
6574ca98fa Fix basic lint errors 2021-05-20 17:56:16 +01:00
J. Ryan Stinnett
21c1179f8d Update extensions for more files with types
This migrates the another bucket of files using some amount of Flow typing to
mark them as TypeScript instead. The remaining type errors are fixed in
subsequent commits.
2021-05-20 17:56:16 +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