Michael Telatynski
|
231b40473b
|
fix the upset CI
|
2021-06-24 21:22:56 +01:00 |
|
Michael Telatynski
|
4492627401
|
More js-sdk type consolidation
|
2021-06-24 19:20:02 +01:00 |
|
Michael Telatynski
|
767b8cd5c7
|
Merge pull request #6260 from matrix-org/t3chguy/2
Fix UserInfo not working when rendered without a room
|
2021-06-24 16:37:35 +01:00 |
|
Michael Telatynski
|
d83a92959b
|
Fix UserInfo not working when rendered without a room
|
2021-06-24 16:30:40 +01:00 |
|
Travis Ralston
|
006c6df205
|
Merge pull request #6253 from matrix-org/travis/leave-reasons
Update membership reason handling, including leave reason displaying
|
2021-06-24 08:52:34 -06:00 |
|
Michael Telatynski
|
bc786cdf4a
|
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
|
2021-06-24 15:23:59 +01:00 |
|
Michael Telatynski
|
f6bb0f4e75
|
Merge pull request #6258 from matrix-org/t3chguy/fix/17752
|
2021-06-24 13:34:45 +01:00 |
|
Michael Telatynski
|
cc1ff2ce1c
|
Remove unused import
|
2021-06-24 13:28:16 +01:00 |
|
Michael Telatynski
|
f965d449b8
|
Merge pull request #6249 from SimonBrandner/ts/member-list
|
2021-06-24 13:25:59 +01:00 |
|
Šimon Brandner
|
d2d8cb3c24
|
Think about what you copy-paste, Simon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:15:44 +02:00 |
|
Šimon Brandner
|
a774aed365
|
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:07:43 +02:00 |
|
Michael Telatynski
|
7b1d64fe49
|
Merge pull request #6259 from matrix-org/t3chguy/1
|
2021-06-24 12:36:12 +01:00 |
|
Michael Telatynski
|
6d3e7730ef
|
Fix two PRs duplicating the css attribute
|
2021-06-24 11:40:49 +01:00 |
|
Michael Telatynski
|
71414904fc
|
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
|
2021-06-24 11:20:12 +01:00 |
|
Michael Telatynski
|
4993fc3e7a
|
Fix edit history modal
defining enums in ts module declarations sadly isn't magic
|
2021-06-24 11:16:13 +01:00 |
|
Michael Telatynski
|
01aadb460d
|
Fix cyclic imports
|
2021-06-24 11:12:32 +01:00 |
|
Michael Telatynski
|
cd8f8dc458
|
Merge pull request #6256 from matrix-org/t3chguy/fix/17744
Fix invite dialog being cut off when it has limited results
|
2021-06-24 10:52:41 +01:00 |
|
Michael Telatynski
|
26d8c4d2e6
|
Improve design of the multi inviter error dialog
|
2021-06-24 10:03:32 +01:00 |
|
Michael Telatynski
|
0e2f617d94
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
|
2021-06-24 09:33:39 +01:00 |
|
Michael Telatynski
|
47be728eb2
|
Fix invite dialog being cut off when it has limited results
|
2021-06-24 09:21:52 +01:00 |
|
Michael Telatynski
|
89231a4d35
|
Merge pull request #6255 from matrix-org/t3chguy/fix/17750
|
2021-06-24 09:18:45 +01:00 |
|
Travis Ralston
|
72099c1a08
|
Update punctuation
|
2021-06-23 19:42:47 -06:00 |
|
Michael Telatynski
|
0e51fcc761
|
Fix pinning event in a room which hasn't had events pinned in before
|
2021-06-23 21:12:25 +01:00 |
|
Travis Ralston
|
e290fdaabc
|
Update widget-api for https://github.com/matrix-org/matrix-react-sdk/pull/6178
|
2021-06-23 11:21:56 -06:00 |
|
Travis Ralston
|
9d07519214
|
Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop
|
2021-06-23 11:21:19 -06:00 |
|
Travis Ralston
|
e696a1d5dc
|
Update membership reason handling, including leave reason displaying
Incorporates ideas from https://github.com/matrix-org/matrix-react-sdk/pull/6198
|
2021-06-23 10:31:08 -06:00 |
|
Michael Telatynski
|
ef2dcaea3d
|
Merge pull request #6250 from matrix-org/t3chguy/fix/16843
|
2021-06-23 16:22:26 +01:00 |
|
Michael Telatynski
|
5d93216c94
|
Decrease e2e shield fill mask size so that it doesn't overlap
|
2021-06-23 16:10:47 +01:00 |
|
Šimon Brandner
|
b7a821a9e4
|
.tsx can also be tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 16:00:13 +02:00 |
|
Šimon Brandner
|
0df6200dd0
|
Convert MemberList-test to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 16:00:13 +02:00 |
|
Šimon Brandner
|
99c442cea7
|
Convert MemberList to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 16:00:06 +02:00 |
|
Michael Telatynski
|
a8dfc4488f
|
Convert more of js-sdk crypto and fix underscored field accesses
|
2021-06-23 14:47:24 +01:00 |
|
Michael Telatynski
|
73b7610228
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5.1
|
2021-06-23 13:05:21 +01:00 |
|
David Baker
|
f0ad70f0e7
|
Merge pull request #5786 from DantrazTrev/DialPad
Dial Pad UI bug fixes
|
2021-06-23 11:41:41 +01:00 |
|
Michael Telatynski
|
1fe1288427
|
Merge pull request #6247 from SimonBrandner/feature/media-device-handler
|
2021-06-23 11:10:09 +01:00 |
|
Šimon Brandner
|
4ab9758b67
|
log -> warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 10:43:49 +02:00 |
|
Šimon Brandner
|
0e582c425c
|
Make this look nicer
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
|
2021-06-23 10:42:19 +02:00 |
|
Šimon Brandner
|
1bef985d46
|
Remove emmiting that isn't useful for us now
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 10:39:10 +02:00 |
|
Šimon Brandner
|
95624b3fa6
|
Add some docs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 10:37:15 +02:00 |
|
Šimon Brandner
|
6c9e0e54e9
|
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 10:27:51 +02:00 |
|
Šimon Brandner
|
58151d71c5
|
Handle mid-call output changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 10:09:53 +02:00 |
|
Germain
|
35b8f79fbd
|
Merge pull request #6228 from matrix-org/gsouquet/fix-17673
|
2021-06-23 09:08:43 +01:00 |
|
Germain
|
bca19783fa
|
Merge pull request #6246 from matrix-org/gsouquet/fix-dependencies-mismatch
Fix dependency and lockfile mismatch
|
2021-06-23 09:03:15 +01:00 |
|
Germain Souquet
|
057f46ad9d
|
fix dependency and lockfile mismatch
|
2021-06-23 08:44:48 +01:00 |
|
Šimon Brandner
|
9bceb40820
|
CallMediaHandler -> MediaDeviceHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 09:26:33 +02:00 |
|
Travis Ralston
|
759a4e796f
|
Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
Improve room directory click behaviour
|
2021-06-22 19:44:20 -06:00 |
|
Michael Telatynski
|
d5581f00cc
|
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
|
2021-06-22 22:56:49 +01:00 |
|
Michael Telatynski
|
50a5c03730
|
Merge pull request #6151 from matrix-org/t3chguy/fix/17244
|
2021-06-22 22:52:33 +01:00 |
|
Michael Telatynski
|
2a3b92f7d7
|
Merge pull request #6244 from matrix-org/t3chguy/fix/17368
Hide communities invites and the community autocompleter when Spaces on
|
2021-06-22 22:50:28 +01:00 |
|
Michael Telatynski
|
9f20d6661d
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
|
2021-06-22 22:49:28 +01:00 |
|