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 |
|
Šimon Brandner
|
b065f6d1a4
|
Remove sdk...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 16:48:36 +02:00 |
|
Šimon Brandner
|
f0dbc974fa
|
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
|
2021-06-24 16:44:13 +02:00 |
|
Šimon Brandner
|
c0a1127cb7
|
Fix PowerStatus
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 16:43:11 +02:00 |
|
Šimon Brandner
|
f08b92309f
|
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 16:35:33 +02:00 |
|
Michael Telatynski
|
bc786cdf4a
|
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
|
2021-06-24 15:23:59 +01:00 |
|
Jaiwanth
|
544761329c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
|
2021-06-24 18:33:30 +05:30 |
|
Jaiwanth
|
70cc2b20d5
|
Fix auto import
|
2021-06-24 18:23:08 +05:30 |
|
Jaiwanth
|
112dfa2b96
|
Finish JSON export implementation
|
2021-06-24 18:19:12 +05:30 |
|
Šimon Brandner
|
8fb788ae56
|
Iterate EntityTile once more
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:39:51 +02:00 |
|
Šimon Brandner
|
5b21cff240
|
Iterate MemberTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:38:21 +02:00 |
|
Šimon Brandner
|
1b64cd0c88
|
Iterate PresenceLabel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:36:22 +02:00 |
|
Michael Telatynski
|
f6bb0f4e75
|
Merge pull request #6258 from matrix-org/t3chguy/fix/17752
|
2021-06-24 13:34:45 +01:00 |
|
Šimon Brandner
|
e436e28f01
|
Make TS happy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:31:04 +02:00 |
|
Šimon Brandner
|
298e505381
|
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:29:24 +02: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
|
0542c69b66
|
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:13:27 +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 |
|
Šimon Brandner
|
6333d4aa36
|
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:02:06 +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 |
|
Šimon Brandner
|
a8b2c6d36b
|
Type event
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 12:24:42 +02: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 |
|
Šimon Brandner
|
0fe6a28853
|
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
|
2021-06-24 10:57:09 +02:00 |
|
Šimon Brandner
|
7eb3642692
|
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:42:01 +02:00 |
|
Šimon Brandner
|
8d47ea63c2
|
Make pinned message text clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:41:55 +02:00 |
|
Šimon Brandner
|
ebe19168c2
|
Add allowClose to payload
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:39:45 +02:00 |
|
Jaiwanth
|
4bfac11911
|
i18n
|
2021-06-24 14:04:37 +05:30 |
|
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 |
|
Jaiwanth
|
dd40f81edf
|
Wrap media fetch in try catch
|
2021-06-24 14:03:12 +05:30 |
|
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 |
|
Šimon Brandner
|
e25940cbdd
|
Convert PresenceLabel to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 19:22:11 +02:00 |
|
Šimon Brandner
|
87d27593de
|
Convert MemberTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 19:22:11 +02:00 |
|
Šimon Brandner
|
d5acfc6cf4
|
Convert EntityTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-23 19:22:06 +02: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 |
|