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

606 commits

Author SHA1 Message Date
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
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
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
Bruno Windels
6cce65a2a5 fix lint 2020-01-24 12:08:47 +01:00
Bruno Windels
2483337e89 don't use removed .event property anymore on verification request 2020-01-24 11:59:01 +01:00
Bruno Windels
716c8ba68f pr feedback 2020-01-17 17:02:31 +01:00
Travis Ralston
d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Travis Ralston
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export 
Convert CommonJS exports to ES6 exports
 2020-01-08 09:09:11 -07:00
Michael Telatynski
9c500e3544 Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	src/components/views/messages/TextualBody.js
 2020-01-06 11:51:35 +00:00
Bruno Windels
7a88a94936 fixes! 2020-01-03 13:50:13 +01:00
Bruno Windels
52c7c5b837 render done tile as accepted 2020-01-03 13:50:13 +01:00