Commit Graph

8095 Commits

Author SHA1 Message Date
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
Bruno Windels fa0319f14b apply renamed (token -> from) option 2019-06-26 15:49:24 +02:00
Travis Ralston 838ef7fa40 Merge pull request #3141 from matrix-org/travis/fix-guest-experience
Supply oobData to RoomPreviewBar
2019-06-26 07:14:00 -06:00
Travis Ralston 854cb8a57e Merge pull request #3140 from matrix-org/travis/make-breadcrumbs-less-of-a-jerk
Don't boost trackpad users in breadcrumbs
2019-06-26 07:13:19 -06:00
Travis Ralston 8d85967824 Merge pull request #3139 from matrix-org/travis/upgrades-final
Fix room upgrade warning being chopped off and a spelling mistake
2019-06-26 07:12:39 -06:00
Bruno Windels fe3be39fe7 don't hide timestamps 2019-06-26 11:59:56 +02:00
Bruno Windels ee03a0f31d recycle EventTile css to make history items look mostly similar 2019-06-26 11:59:56 +02:00
Bruno Windels 8c9a6ddf96 support edits pagination in a ScrollPanel 2019-06-26 11:59:56 +02:00
Bruno Windels 0fe28cba43 support emotes in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels e7fc84d5da render history items in own component
including:
- respect 12/24 hour setting
- pillify
2019-06-26 11:59:56 +02:00
Bruno Windels 19b4699bc2 WIP for showing pills in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels e54881aa24 WIP 2019-06-26 11:59:56 +02:00
Bruno Windels 8b5f07e63d open edit dialog on clicking (edited) 2019-06-26 11:59:56 +02:00
Bruno Windels ef71e6fd4f very basic & hackish edit history dialog 2019-06-26 11:59:56 +02:00
J. Ryan Stinnett b673742e40 Merge pull request #3138 from matrix-org/jryans/quick-reactions-v2
Add quick reaction buttons in tooltip
2019-06-26 09:53:38 +01:00
Travis Ralston 5f242f0285 Supply oobData instead of erroring 2019-06-25 20:57:07 -06:00
Travis Ralston e5c3e5988b Revert "Don't use oobData if there is none"
This reverts commit a73436e1a1.
2019-06-25 20:56:49 -06:00
Travis Ralston ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -06:00
Travis Ralston a73436e1a1 Don't use oobData if there is none
Fixes the "buttons don't work" problem on https://github.com/vector-im/riot-web/issues/10114
2019-06-25 20:31:20 -06:00
Travis Ralston 7b00d29ea6 Don't boost trackpad users in breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/10005
2019-06-25 16:08:11 -06:00
Travis Ralston 0701d89bbe Fix upgrade warning being chopped off
The flex box was behaving a bit strange, so we just wrap the content and change `height: 235px` to `max-height: 235px` to get scrollbars.
2019-06-25 15:40:22 -06:00
Travis Ralston b6242dbad2 Fix spelling 2019-06-25 13:54:48 -06:00
Travis Ralston 9771ce1e04 Merge pull request #3136 from matrix-org/t3chguy/room_directory_autojoin
When joining from room directory, use auto_join
2019-06-25 12:28:41 -06:00
J. Ryan Stinnett 93384f91f5 Show reaction title and shortcode on hover
This shows the title and shortcode for the hovered reaction at the bottom of the
tooltip. If nothing is hovered, a blank space is shown for now, but will
eventually become a link to a full emoji picker in future work.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 18:15:03 +01:00
J. Ryan Stinnett c1821fabd3 Remove toggling reaction dimensions
This removes the v1 Reactions UX which only allowed you to choose only one emoji
out of each pair. It is replaced by a different UX inside a tooltip and without
these constraints.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:31 +01:00
J. Ryan Stinnett fd2723585f Add quick reaction buttons in tooltip
This adds the set of quick reactions as buttons in a new tooltip accessed via
the react action in the message action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:13 +01:00
J. Ryan Stinnett 91f707341a Tweak handler name to match others 2019-06-25 15:12:30 +01:00
J. Ryan Stinnett 8926992feb Add react button to action bar
This adds a (temporarily non-functional) react button to the action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 15:12:30 +01:00
J. Ryan Stinnett c9dc4cbea3 Merge pull request #3137 from matrix-org/jryans/tooltip-interaction
Improve API and interactivity of new tooltip
2019-06-25 12:26:25 +01:00
J. Ryan Stinnett 67130cb45f Condense isInRect 2019-06-25 11:57:55 +01:00
Michael Telatynski 7391796eab Only autojoin using the search box enter/join btn 2019-06-25 10:18:47 +01:00