Commit graph

1016 commits

Author SHA1 Message Date
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
Michael Telatynski
44e14a7d43 Support blurhashes on stickers 2021-05-24 10:06:17 +01:00
Michael Telatynski
9c599b567d Fix alignment of image blurhashes and interplay with spinners 2021-05-21 21:39:38 +01:00
Michael Telatynski
3a2e5389f6 Support blurhash for video posters 2021-05-21 21:20:00 +01:00
Michael Telatynski
dbca9b4625 use const for blurhash field 2021-05-21 21:19:41 +01:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00
Michael Telatynski
563e6433b9 Don't store blurhash in state, its immutable and pointless 2021-05-20 15:47:11 +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
Michael Telatynski
bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
2021-05-18 13:48:40 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Michael Telatynski
6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Michael Telatynski
a41d76b588 fix typos 2021-05-13 14:14:01 +01:00
Michael Telatynski
76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Travis Ralston
3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Tulir Asokan
330f222dd1 Remove redundant code and move presentableTextForFile out of MFileBody
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-05-01 16:11:30 +03:00
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
J. Ryan Stinnett
83035b6b6a
Merge pull request #5931 from SimonBrandner/fix-indent
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
70204d6111 Prevent peeking members from reacting
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Michael Telatynski
cc3571c559 fix removed pixelRatio 2021-04-27 09:56:28 +01:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states
This moves most of them out of the context menu.
2021-04-21 16:24:17 -06:00
Šimon Brandner
eee1294374
Make both have the same baseline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:37:25 +02:00
Šimon Brandner
ffcd79f4a3
Remove brackets
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:34:03 +02:00
Šimon Brandner
4e1409dc2c
Add private
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-04-20 11:40:50 +02:00
Šimon Brandner
39eb487f49
TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 11:09:03 +02:00
Tulir Asokan
b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Šimon Brandner
61a260cd40
Format mxid 2021-04-18 20:02:22 +02:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view
Improve image view
2021-04-13 19:01:27 -06:00
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Šimon Brandner
e1446f01e4
Make ImageView static
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Tulir Asokan
522d58eb57 Add fake fallback thumbnail URL for encrypted videos
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-04-02 20:27:26 +03:00
Šimon Brandner
80854ab6bb
Don't show seconds in ImageView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:25:21 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:15:51 +02:00
Tulir Asokan
c31967dc97 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-26 21:31:28 +02:00
Robin Townsend
f1a9c5ae93 Fix line numbers when missing trailing newline
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-25 17:38:34 -04:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Tulir Asokan
99717db762 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-19 21:58:30 +02:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Travis Ralston
f0d5edbc37 Render voice messages as audio messages for now 2021-03-16 23:48:47 -06:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-14 08:30:28 +01:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Tulir Asokan
8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00
Travis Ralston
7f52e78748 Make styles dynamic 2021-03-10 21:08:01 -07:00
Travis Ralston
ebf1efe01b docs 2021-03-10 12:32:18 -07:00
Travis Ralston
a7debdd946 Fix tinting for download icon
As shown in https://github.com/vector-im/element-web/issues/16546
2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00
Travis Ralston
eb45731d2e
Merge pull request #5735 from matrix-org/travis/use-strict-no
Remove a bunch of useless 'use strict' definitions
2021-03-09 07:24:41 -07:00
Panagiotis
ef267829de Merge branch 'develop' into edit-view-source 2021-03-09 14:49:05 +02:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source
Display decrypted and encrypted event source on the same dialog
2021-03-09 11:36:53 +00:00
Travis Ralston
591ccabab9 Remove a bunch of useless 'use strict' definitions 2021-03-08 20:26:08 -07:00
Travis Ralston
fc5b1ed9d6 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:39 -07:00
Panagiotis
7963d7f49e address PR comments
cleanup, change to isEncrypted, comments
2021-03-08 21:21:37 +02:00
Travis Ralston
761ced13f2
Merge pull request #5719 from matrix-org/travis/file-representation
UI refresh for uploaded files
2021-03-08 08:52:43 -07:00
Panagiotis
51ac5421c9 chore: refactor code
pass only the mxEvent object to ViewSource
derive the necessary values inside the component
2021-03-06 11:30:31 +02:00
Panagiotis
2c64dac514 fix: show decrypted source on EditHistory -> ViewSource
pass correct props to the component
2021-03-05 19:57:37 +02:00
Travis Ralston
8d143331a8 Appease the linter 2021-03-04 20:10:47 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
2021-03-04 20:07:48 -07:00
Travis Ralston
08d35073de Improve commentary 2021-03-02 11:04:12 -07:00
Travis Ralston
9cec382865 Change sending->sent state to match new designs
For https://github.com/vector-im/element-web/issues/16424
2021-03-01 16:25:19 -07:00
Šimon Brandner
4f3fe3d236
Add comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:09:52 +01:00
Šimon Brandner
b18622efe4
Show full date
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:20:34 +01:00
Šimon Brandner
bd5efc7ceb
Pass permallinkCreator to ImageView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:11:08 +01:00
J. Ryan Stinnett
c57b49a354
Merge pull request #5673 from SimonBrandner/dont-show-copy-button
Add <code> if it's missing
2021-02-24 13:33:39 +00:00
Šimon Brandner
986950697b
Rmove unnecessary code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 14:10:09 +01:00
Šimon Brandner
024871f59d
Merge branch 'dont-show-copy-button' of https://github.com/SimonBrandner/matrix-react-sdk into dont-show-copy-button 2021-02-24 13:41:16 +01:00
Šimon Brandner
363b753306
Avoid innerHTML
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 13:40:37 +01:00
Šimon Brandner
61cd026d7a
Improve comment
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-24 13:07:25 +01:00
J. Ryan Stinnett
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes"
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
2021-02-23 12:03:08 +00:00
Šimon Brandner
ce1be7a4cd
Use length instead of the first element
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:49:26 +01:00
Šimon Brandner
c9baff1e10
Move the _addCodeElement() call down a bit
We can skip this if the first if statement is true

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:46:03 +01:00
Šimon Brandner
c965119410
Add _addCodeElement method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:40:53 +01:00
Šimon Brandner
6149567c62
Add <code> if it's missing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 13:43:57 +01:00
Šimon Brandner
87a2454556
Revert "Don't show copy button if there is no <code>"
This reverts commit c76cc33ebf.
2021-02-22 13:41:20 +01:00
Šimon Brandner
c76cc33ebf
Don't show copy button if there is no <code>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 13:23:39 +01:00
Tulir Asokan
dfcf701449 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-02-19 21:47:10 +02:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes
Improve URL preview formatting and image upload thumbnail size
2021-02-17 11:37:37 +00:00
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
2021-02-16 18:03:12 +00:00
Šimon Brandner
6b0b46b917
Fix duplication caused by highlighting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6
Added second comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3
Added comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7
Remove nested for loop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:18:23 +01:00
Šimon Brandner
4a7bc74e99
Fix duplication of codeblock elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 19:46:30 +01:00
William Kray
cd1a99186b change image rendering size max height 2021-02-08 09:26:10 -08:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
ec73f2ec49
Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
Šimon Brandner
77248725ed
Added onHeightChanged call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
Šimon Brandner
ad5c8fe7e4
Revert "Rerender MessagePanel"
This reverts commit c7e61ac71d.
2021-02-05 08:27:07 +01:00
Šimon Brandner
9bd8fef6b3
Change comment styling
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
Šimon Brandner
9db86a38f6
Update src/components/views/messages/TextualBody.js
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-04 17:58:21 +01:00
Travis Ralston
c1b33d3e2c Fix Jitsi widgets causing localized tile crashes
Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case.

This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739
2021-01-27 14:40:04 -07:00
Šimon Brandner
c7e61ac71d
Rerender MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 17:32:57 +01:00
Šimon Brandner
97c5058f00
Removed log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:10:21 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:08:55 +01:00
Šimon Brandner
c737543114
Remove commented lines
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:04:51 +01:00
Šimon Brandner
bd2423a52c
Added line numbering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 10:53:18 +01:00
Šimon Brandner
14bf169631
Handle small codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 15:01:23 +01:00
Šimon Brandner
f8179f0c7a
Fix inverted icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 14:08:57 +01:00
Šimon Brandner
25f30ca79f
Fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5
Simplifie
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2
Rename some variable and cleanup a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 08:44:32 +01:00
Šimon Brandner
58b2c18cf5
This somehow works
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00
Šimon Brandner
95939f3d6c
Added _wrapInDiv() method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 18:21:59 +01:00
Šimon Brandner
e6ab47ff76
Fix bug
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 16:35:32 +01:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Šimon Brandner
8a4af2f348
Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-18 17:49:09 +01:00
J. Ryan Stinnett
e90009772d Fix React warnings about missing key for edited messages
This uses a fragment instead of an array to avoid the need for key attributes.
2021-01-15 13:20:49 +00:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
2020-12-01 13:05:48 -07:00
J. Ryan Stinnett
3e85b6d085 Fix encrypted video playback in Chrome-based browsers
For Chrome-based browsers, it seems we need to set some non-empty `src` URI for
the video element's play button to be enabled, so this crafts an empty `data`
URI and ensures playing is triggered once the real content has been fetched.

Fixes https://github.com/vector-im/element-web/issues/15694
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5352
2020-11-19 13:30:05 +00:00
J. Ryan Stinnett
f7e2d70ddf Tweak video component code style 2020-11-18 17:41:54 +00:00
Michael Telatynski
54e41b5f32 fix tests 2020-11-05 16:27:41 +00:00
Michael Telatynski
2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Michael Telatynski
4e2d9c28f5 Convert EncryptionEvent to Typescript 2020-11-04 17:21:25 +00:00
Michael Telatynski
ff25a9b45d Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth 2020-11-04 17:06:38 +00:00
David Baker
7ec1d5a881 Fix a bunch of silly lint errors
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.

These are the easiest bunch.
2020-10-30 18:18:17 +00:00
Will Hunt
c8485419c1 Fix bug that would cause failed to decrypt messages in non-encrypted rooms 2020-10-30 11:29:32 +00:00
Will Hunt
7eb54cc83c Also only download images after clicking on them 2020-10-23 17:16:09 +01:00
Will Hunt
e5228e2795 alt is not valid on video element 2020-10-23 16:42:23 +01:00
Will Hunt
7164284bb6 Do not download encrypted video if autoplay is not on 2020-10-23 16:33:40 +01:00
Will Hunt
bbb4c7f801 Convert MVideoBody to typescript 2020-10-23 16:32:04 +01:00
Michael Telatynski
38bf7b3055 Apply the fix more generically
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 09:46:54 +01:00
Michael Telatynski
910bdf0802 Fix broken rendering of Room Create when showHiddenEvents enabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 09:38:45 +01:00
Michael Telatynski
8a226781c4 Fix edited replies being wrongly treated as big emoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 11:08:43 +01:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-02 16:38:02 +01:00
Tulir Asokan
2bb7b6535f Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-10-02 17:28:45 +03:00
Tulir Asokan
987cdf1bf0 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-19 19:14:37 +03:00
Travis Ralston
e52a02d733 Appease the linter 2020-09-16 17:26:00 -06:00
Travis Ralston
dca48b984f Be more sane 2020-09-16 15:47:06 -06:00
Travis Ralston
959b8dd314 de-state 2020-09-16 14:59:40 -06:00
Travis Ralston
f412f8defe Change copy if the widget is unpinned 2020-09-16 14:59:15 -06:00
Travis Ralston
b4af0140d4 Render Jitsi widget state events in a more obvious way
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
2020-09-16 12:38:47 -06:00
Michael Telatynski
caef9b27a0 Also hide bug reporting prompts from the Error Boundaries 2020-09-16 10:50:53 +01:00
Tulir Asokan
75a0178dad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-04 12:41:38 +03:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
Michael Telatynski
da97d8885b Fix react error about functional components can't take props 2020-08-29 13:51:43 +01:00
Michael Telatynski
72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Travis Ralston
c9d98a1d19
Merge pull request #5124 from matrix-org/travis/settings-v3
Settings v3: Feature flag changes
2020-08-19 12:00:48 -06:00
Michael Telatynski
b95956a3a4 Clear url previews if they all get edited out of the event 2020-08-19 10:38:26 +01:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Michael Telatynski
655cc95570 fix typo 2020-08-14 13:37:28 +01:00
Michael Telatynski
591847b274 Watch for Event.status instead as we can do some things in SENT 2020-08-14 13:37:11 +01:00
Michael Telatynski
de9816574f Make event subscriptions conditional when needed 2020-08-14 13:30:27 +01:00
Michael Telatynski
f982c7b334 Message Action Bar, subscribe to localEventIdReplaced events 2020-08-14 13:22:52 +01:00
Travis Ralston
53db386731 Add support for blurhash (MSC2448)
MSC: https://github.com/matrix-org/matrix-doc/pull/2448

While the image loads, we can show a blurred version of it (calculated at upload time) so we don't have a blank space in the timeline.
2020-08-10 22:07:19 -06:00
Tulir Asokan
db5121aeca Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-08-03 16:49:43 +03:00
Swapnil Raj
1d3635e1c8 Replaced string actions with their corresponding types 2020-07-22 15:14:50 +05:30
Hubert Chathi
cbe4f04cd7
Merge pull request #5029 from uhoreg/sanitize_language
don't syntax highlight languages that begin with "_"
2020-07-21 13:12:51 -04:00
Hubert Chathi
2ce493307e don't syntax highlight languages that begin with "_" 2020-07-21 12:47:40 -04:00
Jorik Schellekens
b3fa855bd8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 16:22:32 +01:00
Michael Telatynski
e9633b2e3b Use mouseleave instead of mouseout for hover events. Fix tooltip flicker
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-18 12:01:51 +01:00
Jorik Schellekens
58532f2ac4
Merge pull request #4990 from matrix-org/joriks/irc-layout-truncate-upload-name
ellipse senders for images and videos
2020-07-17 22:04:19 +01:00
Michael Telatynski
fc66a15504 Add tooltips to the Message Action Bar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 18:36:32 +01:00
Michael Telatynski
9ec2ca447c Update style of default tooltips to match the new style
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 16:19:10 +01:00
Michael Telatynski
a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
2020-07-16 15:47:12 +01:00
Michael Telatynski
d5f2d43429 Improve Tooltip font/layout consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:15:00 +01:00
Michael Telatynski
05b100f44d
Merge pull request #4975 from matrix-org/t3chguy/a11y-toolbar
Create a generic ARIA toolbar component
2020-07-16 12:41:05 +01:00
Jorik Schellekens
e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Michael Telatynski
8703bc1abc Create a generic ARIA toolbar component which works with existing roving tab index context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 03:47:35 +01:00
Michael Telatynski
4e8203cca1 revert some changes to resolve what looks like a props mutation race-condition
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:42:51 +01:00
Michael Telatynski
646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
Jorik Schellekens
b110639c76 Merge remote-tracking branch 'origin' into joriks/eslint-config 2020-06-29 16:49:33 +01:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp
Show timestamp of redaction on hover
2020-06-29 11:10:25 +01:00
Andrew Morgan
b00d822bc0 Remove alt, use aria-label 2020-06-26 01:22:49 +01:00
Andrew Morgan
6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
Jorik Schellekens
7699aafcaf Use new eslint package- fix lint issues in ts and js 2020-06-23 17:01:19 +01:00
Tulir Asokan
4521e9feb1 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-06-07 15:12:30 +03:00
David Baker
d2fe4bcecd Unused imports 2020-05-26 13:46:47 +01:00
David Baker
7e45a71a8a Remove EncryptedEventDialog
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
2020-05-26 13:37:57 +01:00
Tulir Asokan
4e5680de85 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-05-25 19:21:19 +03:00
Michael Telatynski
5e00481639 Fix sentMessageAndIsAlone by dispatching message_sent more consistently
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 13:08:29 +01:00
Aaron Raimist
b0be99a8f0
Show timestamp of redaction on hover
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-05-22 14:41:32 -05:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Jorik Schellekens
9b7c63a711 Duplicated names 2020-05-08 20:53:32 +01:00
Michael Telatynski
6ff093f5a3 Bring back UnknownBody for UISIs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-08 19:15:59 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies.
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
2020-05-07 14:04:56 +01:00
Michael Telatynski
3e35cffae7 null-guards
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:53:32 +01:00
Michael Telatynski
a399b1018a fix flashing by ""
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:16:08 +01:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:07:39 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Michael Telatynski
135cecbd4f
Merge pull request #4410 from matrix-org/t3chguy/copy
consolidate and fix copy to clipboard
2020-04-16 09:47:24 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Tulir Asokan
25af26323c Make image reply rendering even more compact 2020-04-10 15:45:59 +03:00
Tulir Asokan
26a4a23a33 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-04-10 13:56:01 +03:00
Michael Telatynski
90255be499 Fix copy button on code blocks when there is no code just pre
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:17:19 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Travis Ralston
0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Zoe
04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00
Zoe
9c392ce8bb Merge branch 'develop' into foldleft/better-errors 2020-03-26 13:38:50 +00:00
Travis Ralston
e4d323d2f2 Disable edits on redacted events
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
Tulir Asokan
03d36f30ec Fix lint errors 2020-03-05 13:44:54 +02:00
Tulir Asokan
a8c5574bc8 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-03-05 13:19:15 +02:00
Michael Telatynski
c0b68ccd53 only automatically download in usercontent if user requested it 2020-03-03 13:23:33 +00:00
Michael Telatynski
0e65d54af2 Fix having to decrypt & download in two steps 2020-03-03 11:03:40 +00:00
Bruno Windels
682781aa48 better word smithing 2020-02-25 13:27:59 +01:00
Bruno Windels
bd584ab236 from verification tile, also don't wait to show right panel 2020-02-25 13:27:19 +01:00
Zoe
adf6dfe4ea Threaded through the event type to the user 2020-02-25 10:30:35 +00:00
Zoe
3302469a2b Catch errors sooner so users can recover more easily 2020-02-24 18:04:11 +00:00
Michael Telatynski
0bcdf062a3 reset opener when using window.open
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:22:12 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:14:29 +00:00
Matthew Hodgson
7696f704b2 Fix two big DOM leaks which were locking Chrome solid.
pillifyLinks leaked Pill components, which if they contained a BaseAvatar
would leak a whole DOM tree retained by the BaseAvatar's onClientSync
event listener.  This tracks the Pill containers so they can be unmounted
via unmountPills.

BasicMessageComposer set an event listener on selectionchange in onFocus
which leaked if onBlur wasn't called.  This removes it in unmount.

We've also seen Velociraptor retaining full DOM trees from RRs, which
this doesn't address as the leak is probably within Velocity, and the plan
is to replace it with CSS animations.

Should fix https://github.com/vector-im/riot-web/issues/12417
2020-02-22 23:51:30 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent
Get rid of dependence on usercontent.riot.im
2020-02-19 12:53:01 +00:00
Michael Telatynski
627a4d4ea4 Update comments and such
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 16:53:45 +00:00
Michael Telatynski
12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent 2020-02-13 16:36:05 +00:00
Bruno Windels
3292991491 provide specific label for when accepting/declining is in progress
also distuingish between cancelling and declining
2020-02-13 17:29:38 +01:00
Bruno Windels
3eb07465f7 use canAccept in tile, which takes local echo into account 2020-02-13 17:29:13 +01:00
Michael Telatynski
40b8db84e3 Get rid of dependence on usercontent.riot.im 2020-02-07 22:07:29 +00:00
Bruno Windels
413a149b47 disable "Accept"/"Decline" buttons on verif tile after clicking
to avoid sending double events
2020-02-07 15:50:42 +01:00
J. Ryan Stinnett
110c5f0e61 Fix listener removal in verification tile
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2202
2020-02-04 23:13:55 +00:00
Zoe
150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
Zoe
af0598bbcb double-check user verification 2020-01-31 10:37:40 +00:00
David Baker
d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
David Baker
58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker
2332cdb5d8
full stop
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-30 20:47:46 +00:00
David Baker
5447a04f8e oops, forgot the component 2020-01-30 20:15:15 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
Bruno Windels
3590c97d96 unrelated fix: rerender hidden event tile when decrypted
to get accurate type
2020-01-29 15:27:55 +01:00
Michael Telatynski
342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88 Apply a huge part of the decorations and copy 2020-01-24 16:16:46 +00:00