a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
...
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
...
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind
2021-06-28 09:10:09 +01:00
d669f55b60
Make toast dismiss button less prominent
2021-06-28 08:52:15 +01:00
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice
...
Encrypt the voice message file if needed
2021-06-28 01:30:16 -06:00
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786
...
Fix hyper-precise presence
2021-06-26 18:47:17 +01:00
3c6612df93
Fix hyper-precise presence
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 07:53:42 +02:00
b5bb767b8f
Appease the linter
2021-06-25 14:11:50 -06:00
cb0d2a2c4f
Encrypt the voice message file if needed
...
Fixes https://github.com/vector-im/element-web/issues/17729
"oops, should have done that"
2021-06-25 13:54:05 -06:00
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu ( #6237 )
...
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
1c8e24023e
Fix space preview for when user cannot join the space
2021-06-25 11:00:27 +01:00
5facee56b0
Fix space settings using join rule private instead of invite
2021-06-25 10:41:45 +01:00
2b9e2e2e85
Fix private space creation setting an alias anyway
2021-06-25 10:41:13 +01:00
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
2021-06-24 17:05:16 +01:00
d83a92959b
Fix UserInfo not working when rendered without a room
2021-06-24 16:30:40 +01:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
dc2f71bee6
Even more fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:55:44 +02:00
b065f6d1a4
Remove sdk...
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:48:36 +02:00
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
2021-06-24 16:44:13 +02:00
c0a1127cb7
Fix PowerStatus
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:43:11 +02:00
f08b92309f
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:35:33 +02:00
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
2021-06-24 15:23:59 +01:00
8fb788ae56
Iterate EntityTile once more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:39:51 +02:00
5b21cff240
Iterate MemberTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:38:21 +02:00
1b64cd0c88
Iterate PresenceLabel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:36:22 +02:00
298e505381
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:29:24 +02:00
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list
2021-06-24 13:25:59 +01:00
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
a774aed365
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:07:43 +02:00
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:02:06 +02:00
01aadb460d
Fix cyclic imports
2021-06-24 11:12:32 +01:00
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
0e51fcc761
Fix pinning event in a room which hasn't had events pinned in before
2021-06-23 21:12:25 +01:00
e25940cbdd
Convert PresenceLabel to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 19:22:11 +02:00
87d27593de
Convert MemberTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 19:22:11 +02:00
d5acfc6cf4
Convert EntityTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 19:22:06 +02:00
9d07519214
Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop
2021-06-23 11:21:19 -06:00
99c442cea7
Convert MemberList to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 16:00:06 +02:00
a8dfc4488f
Convert more of js-sdk crypto and fix underscored field accesses
2021-06-23 14:47:24 +01:00
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
...
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
1fe1288427
Merge pull request #6247 from SimonBrandner/feature/media-device-handler
2021-06-23 11:10:09 +01:00
58151d71c5
Handle mid-call output changes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 10:09:53 +02:00
35b8f79fbd
Merge pull request #6228 from matrix-org/gsouquet/fix-17673
2021-06-23 09:08:43 +01:00
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-23 09:26:33 +02:00
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
d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
2021-06-22 22:56:49 +01:00
50a5c03730
Merge pull request #6151 from matrix-org/t3chguy/fix/17244
2021-06-22 22:52:33 +01:00
J. Ryan Stinnett