Commit Graph

16373 Commits (daa2250023d3cbe592de402b3bf5f4a3538cbb5f)

Author SHA1 Message Date
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
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
Bruno Windels 515ed2e1bb Also cancel associated events when canceling sending from ctx menu 2019-07-02 10:11:38 +02:00
Bruno Windels 1a4bdbaf96 add (s) for singular to tr 2019-07-01 18:12:42 +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
Bruno Windels 1af8da4a4a change lozenge color of unsent redacted events to red
use css vars so we don't have to repeat the whole lozenge style
2019-07-01 11:06:55 +02:00
Michael Telatynski 4427e139be
Merge pull request #3155 from matrix-org/t3chguy/avatar_cmd
Add /myavatar command
2019-06-29 07:31:20 +01:00
Michael Telatynski 77dbc79386 clean up promises properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-29 07:05:43 +01:00
J. Ryan Stinnett 35c0c3142f
Merge pull request #3158 from matrix-org/jryans/config-docs
Update config.json docs location
2019-06-28 18:13:24 +01: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
J. Ryan Stinnett 527e1e94a4 Update config.json docs location
Part of https://github.com/vector-im/riot-web/pull/10195
2019-06-28 13:44:18 +01:00
Travis Ralston 53d7cc6799
Merge pull request #3156 from matrix-org/t3chguy/unpin_hljs
Unpin highlight.js
2019-06-27 17:24:12 -06:00
Travis Ralston 9be40a27fc
Merge pull request #3154 from matrix-org/travis/syntax-error
Flexboxify generic error page
2019-06-27 14:09:57 -06:00
Michael Telatynski 5473f7ba45 Unpin HLJS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:36:45 +01:00
Michael Telatynski ff8ddd6073
Merge pull request #3153 from matrix-org/t3chguy/devtools_styling
Fix weird scrollbar when devtools is in a narrow browser
2019-06-27 20:14:39 +01:00
Michael Telatynski e8db379fed rename helper method
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 19:41:29 +01:00
Michael Telatynski cebb2b773f Add /myavatar command
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 19:38:12 +01:00
Travis Ralston 7e8eda33fc Flexboxify generic error page 2019-06-27 12:10:58 -06:00
Michael Telatynski 804a0c8507 Fix weird scrollbar when devtools is in a narrow browser
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 18:56:22 +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 a424c3de5c
Merge pull request #3147 from matrix-org/jryans/tooltip-flip-tweaks
Change interactive tooltip to only flip when required
2019-06-27 11:21:49 +01:00
J. Ryan Stinnett e287362a8b Reaction buttons should use pointer cursor 2019-06-27 11:19:36 +01: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