mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 21:18:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
16331 commits 208 branches 547 tags 609 MiB
Commit graph

13277 commits

Author SHA1 Message Date
Travis Ralston
67ecf9db62 expireMs -> expireTs 2019-06-27 09:44:13 -06:00
Travis Ralston
1546cb2923 You win this time, linter. 2019-06-26 22:40:08 -06: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
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
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
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
Bruno Windels
57dce73cee adjust comment 2019-06-24 16:53:42 +02:00
Bruno Windels
8394e162ad cache setting where it's easy 2019-06-24 16:53:31 +02: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
Michael Telatynski
9e7a70b9d5 When joining from room directory, use auto_join 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-23 22:39:04 +01:00
Bruno Windels
5fa3f70fb4 feature flag for displaying edits as well 2019-06-21 18:32:15 +02:00
Bruno Windels
1c7af38d83
Merge pull request #3126 from matrix-org/bwindels/caret-refactoring 
Editor caret improvements
 2019-06-21 15:02:41 +00:00
Bruno Windels
c443dd7a32 clarify why use a BOM marker for the caret nodes 2019-06-21 16:37:29 +02:00