nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
34,043 Commits 258 Branches 582 Tags
401fe1d05bc8ab9f9086bbcd8e5e1daa6ca469da
Commit Graph

828 Commits

Author SHA1 Message Date
Šimon Brandner
401fe1d05b Add call silencing to CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 20:03:09 +02:00
Šimon Brandner
f96c366aa4 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:07:43 +02:00
Michael Telatynski
dddc32d870 Merge pull request #6208 from matrix-org/t3chguy/ts/5 2021-06-18 09:49:03 +01:00
Šimon Brandner
512c054656 Add call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 17:55:18 +02:00
Šimon Brandner
7b6c3aec63 Change some styling to better match the designs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 16:33:00 +02:00
Michael Telatynski
f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-06-17 15:31:06 +01:00
Šimon Brandner
949532c297 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Michael Telatynski
3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Germain Souquet
069e2e13cf Migrate MessageTimestamp to TypeScript 2021-06-16 10:01:30 +01:00
Michael Telatynski
91df392a2a Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Šimon Brandner
e260e8671f Inline display name into return 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-11 15:14:16 +02:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Šimon Brandner
b39c615abc Reorder 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:44:58 +02:00
Šimon Brandner
4185185cdc Reduce number of DOM elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:42:48 +02:00
Šimon Brandner
025148d9fc Merge branch 'develop' into show-username 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:37:22 +02:00
Šimon Brandner
6eb33ac730 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Šimon Brandner
3b2d6d442f Translate unknown call state 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:43:30 +02:00
Germain
7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Šimon Brandner
3331e7bfbe Use enums where possible 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:42:58 +02:00
Šimon Brandner
78229a2fd0 Support user busy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:20:11 +02:00
Šimon Brandner
521b2445a8 Refactoring and fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:18:32 +02:00
Šimon Brandner
70a5715b3d Support hangup reasons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:46:41 +02:00
Šimon Brandner
0785997983 Handle missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:28:45 +02:00
Šimon Brandner
79ec655e66 Fix translations 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:58:17 +02:00
Šimon Brandner
c1fcadba3b Manage some more call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:33:44 +02:00
Šimon Brandner
f96e25d833 Simply use call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:11:48 +02:00
Šimon Brandner
30365ca1ad Allow picking up calls from the timeline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:03:17 +02:00
Šimon Brandner
dac741d8b9 Another rewrite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 09:30:37 +02:00
Šimon Brandner
8eb24d0d74 Rename callState to timelineCallState 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 08:01:34 +02:00
Šimon Brandner
5e4a10ab84 Reorganize HTML 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 07:55:55 +02:00
Šimon Brandner
5e8df03724 Fix styling a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
85bcf8ed52 Hook up CallEventGrouper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc Hook up TimelineCallEventStore and add Avatar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
3ac63b03a6 Use styling for CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
73c66c36dd Add basic CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
J. Ryan Stinnett
118556b542 Merge pull request #6106 from matrix-org/jryans/hidden-events-reactions 
Update reactions row on event decryption
 2021-05-26 17:34:54 +01:00
J. Ryan Stinnett
7d59d5cb39 Tune types in ReactionsRow 2021-05-26 16:51:26 +01:00
J. Ryan Stinnett
d4ca1babbe Update reactions row on event decryption 
This fixes a race (perhaps revealed by the recent lazy decryption work) where
the reactions row have reactions to show, but the event would not be decrypted,
so they wouldn't render. Adding a decryption listener gets things moving again.

Fixes https://github.com/vector-im/element-web/issues/17461
 2021-05-26 16:47:21 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski
974d62e347 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/messages/TextualBody.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-05-26 14:08:01 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Jaiwanth
a65299d8be Update src/components/views/messages/MVoiceMessageBody.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-05-26 13:07:57 +05:30
Jaiwanth
a4907f8061 Destroy playback instance on unmount 2021-05-26 12:57:39 +05:30
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +01:00
Michael Telatynski
d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
 2021-05-24 21:57:38 +01:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00