Commit graph

36777 commits

Author SHA1 Message Date
Jaiwanth
0e3ad652af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-14 00:04:30 +05:30
Jaiwanth
31c9e5962c Move export dialog to async-components 2021-08-14 00:03:02 +05:30
Jaiwanth
7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
David Baker
1842cd1688
Merge pull request #6613 from matrix-org/dbkr/crosssigningpanel_ts
Convert CrossSigningPanel to TS
2021-08-13 18:27:34 +01:00
David Baker
c28d449f3f Fix import
thanks vscode
2021-08-13 18:21:59 +01:00
David Baker
7c8637f5db Add MatrixEvent type 2021-08-13 18:18:48 +01:00
David Baker
c79b6a412d Merge remote-tracking branch 'origin/develop' into dbkr/crosssigningpanel_ts 2021-08-13 18:11:54 +01:00
David Baker
e78640572d Convert CrossSigningPanel to TS
Type: task
2021-08-13 18:07:58 +01:00
David Baker
65eedd00b0
Merge pull request #6611 from SimonBrandner/fix/held-call-pip
Fix PiP of held calls
2021-08-13 17:50:26 +01:00
Šimon Brandner
0ee59a17de
Fix PiP of held calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 18:42:55 +02:00
Travis Ralston
da944b2c6b
Merge pull request #6323 from matrix-org/t3chguy/ts/12
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to TS
2021-08-13 10:08:58 -06:00
Michael Telatynski
df282807b1
Merge pull request #5659 from matrix-org/t3chguy/a11y/composer-list-autocomplete 2021-08-13 16:55:46 +01:00
Travis Ralston
26d5b93760
Merge pull request #6610 from SimonBrandner/feature/add-more-call-states
Add new call tile states
2021-08-13 08:51:31 -06:00
Šimon Brandner
7faf5f040f
Merge remote-tracking branch 'upstream/develop' into feature/add-more-call-states 2021-08-13 16:43:03 +02:00
David Baker
20ac54f3e7
Merge pull request #6609 from SimonBrandner/feature/left-align-call-tiles
Left align call tiles
2021-08-13 15:41:28 +01:00
Šimon Brandner
cda91e44e0
Use new call state icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
Šimon Brandner
fa204c4104
Add declined call buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:34:11 +02:00
Šimon Brandner
032d2866a3
Add "No answer" state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:19:14 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
David Baker
ebc7d9ee1a
Merge pull request #6556 from SimonBrandner/feature/narrow-voip-tiles/18398
Fix call tile behaviour on narrow layouts
2021-08-13 09:44:29 +01:00
Šimon Brandner
5ac5640939
Add a little padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:35:31 +02:00
Šimon Brandner
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398 2021-08-13 10:30:21 +02:00
Jaiwanth
c62210b07c Merge branch 'export-conversations' of https://github.com/jaiwanth-v/matrix-react-sdk into export-conversations 2021-08-13 09:00:20 +05:30
Jaiwanth
00d5a0baa4
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-08-13 08:59:28 +05:30
Jaiwanth
dda24da204 Add copyright headers 2021-08-13 08:59:14 +05:30
Jaiwanth
9cbdc4a613 Use throw error instead of try-catch 2021-08-13 08:34:54 +05:30
Jaiwanth
edfc8af6cf Apply PR Suggestions 2021-08-13 08:30:50 +05:30
Jaiwanth
d32f945e24 Merge branch 'export-conversations' of https://github.com/jaiwanth-v/matrix-react-sdk into export-conversations 2021-08-13 08:08:39 +05:30
David Baker
ecb2d9908d
Merge pull request #6608 from matrix-org/dbkr/kill_persistent_jitsi
Fix video call persisting when widget removed
2021-08-12 19:19:12 +01:00
Andrew Morgan
1ad35b1564
Keep number field in focus when pressing dialpad buttons (#6520) 2021-08-12 18:58:06 +01:00
David Baker
3528d87f30 Remove old version 2021-08-12 18:39:11 +01:00
David Baker
657dcaf989 Fix video call persisting when widget removed
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
2021-08-12 18:36:57 +01:00
James Salter
1a1a76e2d7
Merge pull request #6606 from SimonBrandner/fix/toast-colors
Fix toast colors
2021-08-12 16:09:03 +01:00
Travis Ralston
772b8fb3fa
Merge pull request #6593 from SimonBrandner/fix/correct-button
Use the correct button component for the Call View sidebar button
2021-08-12 08:54:53 -06:00
Andrew Morgan
adce43600d
Update link to matrix-js-sdk CONTRIBUTING file (#6557) 2021-08-12 15:34:33 +01:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:20:30 +02:00
Šimon Brandner
aca073f5da
$system-... -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:16:13 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Dariusz Niemczyk
fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux
Make loading encrypted images look snappier
2021-08-12 12:55:52 +02:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
f53eb4eeed Fix tab trapping behaviour 2021-08-12 11:27:34 +01:00
Michael Telatynski
f9527c9d6b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-08-12 11:21:20 +01:00
Michael Telatynski
9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Michael Telatynski
c6085a1a89
Merge pull request #6603 from SimonBrandner/fix/remove-unnecessary-code 2021-08-12 09:23:28 +01:00
Šimon Brandner
ccaa69b25b
Remove unnecessary code
This somehow doesn't seem to be neccessary anymore, I don't really know why but everything seems to work without it

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:53:42 +02:00
Šimon Brandner
29d20b8125
Use AccessibleTooltipButton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:11:11 +02:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Michael Telatynski
69cf64249f add comment 2021-08-11 21:50:26 +01:00
David Baker
1321e2fe6a
Merge pull request #6600 from matrix-org/dbkr/edit_pr_desc
Edit PR Description instead of commenting
2021-08-11 21:46:12 +01:00
Michael Telatynski
5d98c6f02d Iterate PR based on feedback 2021-08-11 21:45:49 +01:00