mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 08:41:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
34383 commits 219 branches 562 tags 474 MiB
Commit graph

826 commits

Author SHA1 Message Date
Michael Telatynski
8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
 2021-06-29 22:14:40 +01:00
Michael Telatynski
623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
 2021-06-29 15:22:54 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Michael Weimann
e4eeafd485
migrate the message context menu to IconizedContextMenu 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:49 +02:00
Michael Telatynski
c5a1da49ce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/AutoHideScrollbar.tsx
 2021-06-24 16:42:03 +01:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +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
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
cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Germain Souquet
ca123d3c4d Migrate MKeyVerificationRequest to TypeScript 2021-06-21 14:05:56 +01:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer" 2021-06-19 13:38:19 -06:00
Šimon Brandner
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648 2021-06-19 17:24:30 +02:00
Travis Ralston
273fb75fc9 Merge branch 'develop' into travis/event-fixes 2021-06-18 11:26:51 -06:00
Travis Ralston
bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number 
Update MSC number references for voice messages
 2021-06-18 09:23:28 -06:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5 2021-06-18 09:49:03 +01:00
Travis Ralston
a687391b98 Switch order 2021-06-17 14:21:01 -06: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
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
Šimon Brandner
dbdb61c820
Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Michael Telatynski
47ddd33d21 Remove explicit .js imports 2021-06-16 10:24:51 +01:00
Germain Souquet
069e2e13cf Migrate MessageTimestamp to TypeScript 2021-06-16 10:01:30 +01:00
Travis Ralston
d13611736a Update MSC number references for voice messages 
as per https://github.com/matrix-org/matrix-doc/pull/3245
 2021-06-15 17:24:56 -06:00
Travis Ralston
ea46df0d48 Partially restore immutable event objects at the rendering layer 
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
 2021-06-15 14:23:19 -06: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
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
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
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Michael Telatynski
dab75f9b88 Fix add reaction prompt showing even when user is not joined to room 2021-05-20 12:20:53 +01:00