mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 13:51:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
16720 commits 219 branches 562 tags 474 MiB
Commit graph

7772 commits

Author SHA1 Message Date
Michael Telatynski
89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 10:42:14 +01:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying 
Don't allow editing via up-arrow when Replying
 2019-07-06 08:53:22 +01:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit 
If oldContent matches newContent, skip sending the edit
 2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3 Dress up the soft logout page to look like the design 
Fixes https://github.com/vector-im/riot-web/issues/10262

Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
 2019-07-05 15:05:31 -06:00
Travis Ralston
ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 2019-07-05 15:03:24 -06:00
Travis Ralston
1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout 
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
 2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169 Change soft logout rehydrate text if there's pending key backups 
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
 2019-07-05 13:52:14 -06:00
Travis Ralston
d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-05 13:41:04 -06:00
J. Ryan Stinnett
017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread 
Track live events in timeline and use for read receipts and read markers
 2019-07-05 17:55:59 +01:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text 
Allow diplayed reaction values to contain anything
 2019-07-05 16:35:06 +01:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null 
Fix interactive tooltip null target error
 2019-07-05 16:28:12 +01:00
J. Ryan Stinnett
eb0e1eade4 Clamp reaction content width to at most 100px 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7 Allow diplayed reaction values to contain anything 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:06 +01:00
Bruno Windels
70334b69ec implement view source for edits 2019-07-05 16:11:15 +02:00
J. Ryan Stinnett
3c3426d97e Update copyright header 2019-07-05 15:08:55 +01:00
Bruno Windels
f4a8314c4f make dom tree similar to eventtile so red lozenge style applies 2019-07-05 16:05:40 +02:00
Bruno Windels
0aa1252d01 monitor associated send status for edit history events 
to update local echo if needed
 2019-07-05 16:04:34 +02:00
Bruno Windels
2182248d7c mark events from /relations as locally redacted if any pending redaction 2019-07-05 16:03:34 +02:00
J. Ryan Stinnett
5496a4dce6 Fix interactive tooltip null target error 
Fixes https://github.com/vector-im/riot-web/issues/10232
 2019-07-05 15:02:09 +01:00
J. Ryan Stinnett
0ae98a5a4d Track live events in timeline and use for read receipts and read markers 
This changes the `TimelinePanel` to track live events (that have committed to
the server and been remote echoed) as well as the full list of events (which
includes pending events).

The code paths that advance read receipt and read markers are then changed to
only use the live events so that these cannot advance into pending events.

Fixes https://github.com/vector-im/riot-web/issues/9952
 2019-07-05 14:37:19 +01:00
Michael Telatynski
89d568ce97 Don't allow editing via up-arrow when Replying 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-05 08:36:16 +01:00
Travis Ralston
00973a1ee8 Appease the linter 2019-07-04 17:00:09 -06:00
Travis Ralston
03cbd7e8bb Ensure links off the forgot password page land you at soft logout 2019-07-04 16:51:55 -06:00
Travis Ralston
93872e6fa5 Ask for the user's password to rehydrate their soft logged out session 
Fixes https://github.com/vector-im/riot-web/issues/10236

The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().

Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
 2019-07-04 16:51:16 -06:00
Travis Ralston
89131be438 Require that users go to the soft logout page if they're soft logged out 
Fixes https://github.com/vector-im/riot-web/issues/10234
 2019-07-04 15:14:00 -06:00
Travis Ralston
f3c6c73329
Merge pull request #3177 from matrix-org/travis/soft-logout-base 
Implement basic soft logout handling
 2019-07-04 10:22:18 -06:00
Travis Ralston
8ea46a8c4d Remove unneeded page types 2019-07-04 09:59:20 -06:00
Travis Ralston
5e5bf21281 Remove irrelevant debugging 2019-07-04 09:59:07 -06:00
Bruno Windels
8468f7cdc3 support redactions in edit history dialog 2019-07-04 16:33:05 +02:00
Bruno Windels
375976575b add redact button 2019-07-04 11:07:22 +02:00
Bruno Windels
3f28f2e4a6
Merge pull request #3174 from matrix-org/bwindels/edit-history-error 
show /relations error in edit history dialog
 2019-07-04 09:05:29 +00:00
Travis Ralston
521bc90b5f Appease the linter 2019-07-03 16:51:09 -06:00
Travis Ralston
42e6287bdb Implement basic soft logout handling 
Fixes https://github.com/vector-im/riot-web/issues/10235

CSS and copy are left as an exercise for a later iteration.

Login page handling is left for https://github.com/vector-im/riot-web/issues/10236

This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975 to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync.
 2019-07-03 16:46:37 -06:00
Bruno Windels
4dc8de0e71 log server errors in edit history dialog 2019-07-03 17:53:32 +02:00
Bruno Windels
e7e6af2592 use existing strings 2019-07-03 17:51:16 +02:00
David Baker
668d24111c
Merge pull request #3173 from matrix-org/t3chguy/MELS_3pid 
MELS handle m.room.third_party_invite
 2019-07-03 16:02:10 +01:00
David Baker
b43a04634a
Merge pull request #3172 from matrix-org/t3chguy/invites_list 
Fix logic around MemberList invites section, specifically regarding 3pid
 2019-07-03 16:01:01 +01:00
Travis Ralston
7dbd17c137
Merge pull request #3150 from matrix-org/travis/less-typing 
Track the user's own typing state external to the composer
 2019-07-03 08:33:42 -06:00
Bruno Windels
344cc079c5 show /relations error in edit history dialog 2019-07-03 12:16:58 +02:00
Bruno Windels
353f5a205c
Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures 
Handle associated event send failures
 2019-07-03 09:02:58 +00:00
Michael Telatynski
429b8e94df MELS handle m.room.third_party_invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-03 08:58:34 +01:00
Michael Telatynski
bc4bff64f6 Fix logic around MemberList invites section, specifically regarding 3pid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-03 08:38:08 +01:00
J. Ryan Stinnett
cf8eeedcc7
Merge pull request #3169 from matrix-org/jryans/reactions-tooltip-tweaks 
Improve interactive tooltip hover behaviour
 2019-07-02 18:28:09 +01:00
Bruno Windels
daa2250023 fix lint 2019-07-02 18:30:57 +02:00
Bruno Windels
3fd96008c3 Fixup: dont assume there is a prior edit 2019-07-02 17:34:07 +02:00
Bruno Windels
14caed62d0 make sure scrollpanel is mounted before checking scroll 
have seen errors in this direction, so hope this will fix it,
as this is invoked from any EventTile's onHeightChanged callback,
which is often called after some async operation (by when the
timeline can be unmounted already).
doesn't hurt in any case.
 2019-07-02 17:29:37 +02:00
J. Ryan Stinnett
a4275e6d89
Merge pull request #3171 from matrix-org/jryans/login-field-border 
Fix login type selector border
 2019-07-02 15:38:39 +01:00
J. Ryan Stinnett
7fc1288614 Fix login type selector border 
This fixes a regression in the login type selector's border and placement.

Fixes https://github.com/vector-im/riot-web/issues/10223
 2019-07-02 15:09:51 +01:00
Travis Ralston
1d54911581
Merge pull request #3159 from matrix-org/travis/pick-server-tombstone 
Use the event sender instead of event ID for viaServers off a tombstone
 2019-07-02 07:52:40 -06:00
Bruno Windels
357ad3d50c cancel pending edit when sending new edit 2019-07-02 14:52:29 +02:00
Bruno Windels
d0d327620b hide reactions for redacted events 2019-07-02 13:56:27 +02:00
J. Ryan Stinnett
a4587c5013
Merge pull request #3165 from matrix-org/t3chguy/tooltip_accessible_button 
Add AccessibleTooltipButton and use it for RoomSubList buttons
 2019-07-02 10:34:51 +01:00
Michael Telatynski
904a096f72
Update AccessibleTooltipButton.js 2019-07-02 10:28:36 +01:00
Bruno Windels
515ed2e1bb Also cancel associated events when canceling sending from ctx menu 2019-07-02 10:11:38 +02:00
J. Ryan Stinnett
dd94bf799d Improve interactive tooltip hover behaviour 
This gives the interactive tooltip a more natural hover behaviour by removing
the full screen div behind it. This allows the target button to keep its hover
state, for example.

This also removes the click to close behaviour, which was too easy to trigger
accidentally.

Fixes https://github.com/vector-im/riot-web/issues/10179
Fixes https://github.com/vector-im/riot-web/issues/10222
Fixes https://github.com/vector-im/riot-web/issues/10225
 2019-07-01 18:00:59 +01:00
Travis Ralston
64f0a7cbe7
Merge pull request #3162 from matrix-org/travis/cleanup-breadcrumbs 
Clean up legacy breadcrumbs persistence fallback
 2019-07-01 09:47:28 -06:00
Bruno Windels
4be16a380a only show resend options if event hasn't been redacted 
(which can now be only local, which is why this wasn't neccesary before)
 2019-07-01 17:39:30 +02:00
Bruno Windels
0d79b03f53 support resending reactions 2019-07-01 17:39:00 +02:00
Bruno Windels
8160759a52 show the various resend options as different menu items 2019-07-01 17:37:32 +02:00
Bruno Windels
d66d3ca4d2 support resending redaction in context menu 2019-07-01 11:06:55 +02:00
Bruno Windels
6d458154a9 support resending edit in context menu 2019-07-01 11:06:55 +02:00
Michael Telatynski
46a6043e9b Use title prop instead to minimize changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 11:00:21 +01:00
Michael Telatynski
8ed336ea08 Add AccessibleTooltipButton and use it for RoomSubList buttons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 10:58:59 +01:00
Michael Telatynski
d774d96290 Fix some React errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 10:41:39 +01:00
Michael Telatynski
e591d3ef76 take dirty-flag into account for editing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 06:52:19 +01:00
Michael Telatynski
bf9353f3af Merge branches 'develop' and 't3chguy/edit_skip_if_no_edit' of github.com:matrix-org/matrix-react-sdk into t3chguy/edit_skip_if_no_edit 2019-06-29 06:45:06 +01:00
Michael Telatynski
443c7343a0 Merge branches 'develop' and 't3chguy/fix_MELS_labs' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_MELS_labs 2019-06-29 06:36:20 +01:00
Travis Ralston
4f6db320e3
Appease the linter 2019-06-28 16:44:19 -06:00
Travis Ralston
8905566cfb Clean up legacy breadcrumbs persistence fallback 
It's been more than a few weeks.
 2019-06-28 16:30:59 -06:00
Travis Ralston
083c1a78ab Use the event sender instead of event ID for viaServers off a tombstone 
Fixes https://github.com/vector-im/riot-web/issues/10206
 2019-06-28 12:34:46 -06:00
J. Ryan Stinnett
2d1325686d
Merge pull request #3148 from matrix-org/matthew/fix-horizontal-scrolling 
If on trackpad, don't mess with horizontal scrolling.
 2019-06-28 15:21:22 +01:00
J. Ryan Stinnett
00dfdfe7f1
Fix linter warning 2019-06-28 15:16:44 +01:00
J. Ryan Stinnett
33425240f6
Merge pull request #3152 from matrix-org/jryans/reactions-show-all 
Limit reactions row on initial display
 2019-06-28 15:12:48 +01:00
J. Ryan Stinnett
f9e158ff68 Rename link to button 2019-06-28 14:47:41 +01:00
J. Ryan Stinnett
04398b7853 Tweak limits so show all reveals more space than itself 2019-06-28 14:46:57 +01:00
Travis Ralston
8bb860e870 Use fewer functions for typing in the composer 2019-06-27 10:37:33 -06:00
Travis Ralston
17ed62de7d Move MessageComposer typing timeout to TypingStore 2019-06-27 10:35:44 -06:00
Travis Ralston
7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading 
Show a loading state for slow peeks
 2019-06-27 09:24:25 -06:00
Bruno Windels
dff6ca85f2
Merge pull request #3146 from matrix-org/bwindels/dontfailonmissingwebcam 
Don't show error dialog when user has no webcam
 2019-06-27 13:16:36 +00:00
Bruno Windels
f18c389f2d
Merge pull request #3151 from matrix-org/bwindels/e2e-edit-history 
Make edit history work in encrypted rooms.
 2019-06-27 13:16:10 +00:00
J. Ryan Stinnett
59b4a3398d Limit reactions row on initial display 
This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.

Fixes https://github.com/vector-im/riot-web/issues/9570
 2019-06-27 13:17:23 +01:00
Bruno Windels
25aa65ac0d remove leftover logging 2019-06-27 14:13:37 +02:00
Bruno Windels
c0e9edcf40 get decrypted content if needed 2019-06-27 12:33:29 +02:00
Travis Ralston
cd089a3f95 Track the user's own typing state external to the composer 
Fixes https://github.com/vector-im/riot-web/issues/9986

There's a few reasons for pushing this out to its own place:
* In future, we might want to move WhoIsTyping here.
* We have multiple composers now, and although they don't send typing notifications, they could (see https://github.com/vector-im/riot-web/issues/10188)
* In future we may have status for where/what the user is typing (https://github.com/matrix-org/matrix-doc/issues/437)
* The composer is complicated enough - it doesn't need to dedupe typing states too.

Note: This makes use of the principles introduced in https://github.com/vector-im/riot-web/issues/8923 and https://github.com/vector-im/riot-web/issues/9090
 2019-06-26 22:36:55 -06:00
Matthew Hodgson
3873dc724a stupid linter >:( 2019-06-26 21:47:55 +01:00
Matthew Hodgson
7fc5d229d6 fix stuff as per review 2019-06-26 21:13:17 +01:00
Matthew Hodgson
3d11eb430b oops, remove old code 2019-06-26 18:38:46 +01:00
Matthew Hodgson
debcafd760 if on trackpad, don't mess with horizontal scrolling. 
trackpad heuristic is 'if 15 minutes of no horizontal scrollwheel events, assume user may have switched to mousewheel'
 2019-06-26 18:38:03 +01:00
J. Ryan Stinnett
e8fba4f770 Change interactive tooltip to only flip when required 
This changes the interactive tooltip to only flip around when the tooltip
content would be near the window edge.

Fixes https://github.com/vector-im/riot-web/issues/10176
 2019-06-26 18:24:34 +01:00
Bruno Windels
f6e0cd9a03 don't show error dialog when user has no webcam 
instead, retry with just audio.
Also when mounted, check if the user has given enough permissions
to return non-empty labels for the devices, something both ff & chrome
do if you haven't going through the permissions popup yet. If not,
show the permissions button.
 2019-06-26 18:54:15 +02:00
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Bruno Windels
c9c84016cb move EditHistoryMessage to messages directory 2019-06-26 16:17:25 +02:00
Bruno Windels
54de0b298b add "Click to see edits." to tooltip 2019-06-26 16:13:32 +02:00
Bruno Windels
a1548285b5 fix copyright header and whitespace 2019-06-26 16:13:15 +02:00
Bruno Windels
c987f4e8d8 remove passthrough ctor 2019-06-26 16:12:57 +02:00
Bruno Windels
d606c966ea use PureComponent 2019-06-26 16:12:44 +02:00
Bruno Windels
929020a139 remove leftover logging 2019-06-26 15:51:55 +02:00
Bruno Windels
39c96b15d8 set state in ctor 2019-06-26 15:51:46 +02:00
Bruno Windels
f4b86ca265 don't bind 2019-06-26 15:51:28 +02:00