Commit graph

5241 commits

Author SHA1 Message Date
Bruno Windels
515ed2e1bb Also cancel associated events when canceling sending from ctx menu 2019-07-02 10:11:38 +02: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
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
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
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
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
Travis Ralston
ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -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
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
Bruno Windels
a9b5d2095c
Merge pull request #3132 from matrix-org/bwindels/edit-full-feature-flag
feature flag for displaying edits as well
2019-06-24 21:00:58 +00:00
J. Ryan Stinnett
72bfc3b5ea Improve API and interactivity of new tooltip
This reworks the API the `InteractiveTooltip` component so that it's more
natural to use just like other React components. You can now supply the target
component as a child and the tooltip content as a prop.

In addition, this tweaks the interactivity to keep the tooltip on screen until
you move the mouse away from the tooltip and its target.

Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-24 17:32:36 +01:00
J. Ryan Stinnett
f366f7d2b3
Merge pull request #3131 from matrix-org/jryans/interactive-tooltip
Add interactive tooltip style
2019-06-24 15:42:02 +01:00