15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history
...
Edit history dialog
2019-06-26 14:38:53 +00:00
c9c84016cb
move EditHistoryMessage to messages directory
2019-06-26 16:17:25 +02:00
54de0b298b
add "Click to see edits." to tooltip
2019-06-26 16:13:32 +02:00
a1548285b5
fix copyright header and whitespace
2019-06-26 16:13:15 +02:00
c987f4e8d8
remove passthrough ctor
2019-06-26 16:12:57 +02:00
d606c966ea
use PureComponent
2019-06-26 16:12:44 +02:00
929020a139
remove leftover logging
2019-06-26 15:51:55 +02:00
39c96b15d8
set state in ctor
2019-06-26 15:51:46 +02:00
f4b86ca265
don't bind
2019-06-26 15:51:28 +02:00
fa0319f14b
apply renamed (token -> from) option
2019-06-26 15:49:24 +02:00
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
fe3be39fe7
don't hide timestamps
2019-06-26 11:59:56 +02:00
ee03a0f31d
recycle EventTile css to make history items look mostly similar
2019-06-26 11:59:56 +02:00
8c9a6ddf96
support edits pagination in a ScrollPanel
2019-06-26 11:59:56 +02:00
0fe28cba43
support emotes in edit history
2019-06-26 11:59:56 +02:00
e7fc84d5da
render history items in own component
...
including:
- respect 12/24 hour setting
- pillify
2019-06-26 11:59:56 +02:00
19b4699bc2
WIP for showing pills in edit history
2019-06-26 11:59:56 +02:00
e54881aa24
WIP
2019-06-26 11:59:56 +02:00
8b5f07e63d
open edit dialog on clicking (edited)
2019-06-26 11:59:56 +02:00
ef71e6fd4f
very basic & hackish edit history dialog
2019-06-26 11:59:56 +02:00
ca6ddf324f
Show a loading state for slow peeks
2019-06-25 20:56:33 -06:00
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
b6242dbad2
Fix spelling
2019-06-25 13:54:48 -06:00
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
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
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
91f707341a
Tweak handler name to match others
2019-06-25 15:12:30 +01:00
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
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
67130cb45f
Condense isInRect
2019-06-25 11:57:55 +01:00
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
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
f366f7d2b3
Merge pull request #3131 from matrix-org/jryans/interactive-tooltip
...
Add interactive tooltip style
2019-06-24 15:42:02 +01:00
f3641eaa32
Add ability to render null-rejoins in Timeline and MELS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-23 21:41:28 +01:00
5fa3f70fb4
feature flag for displaying edits as well
2019-06-21 18:32:15 +02:00
1c7af38d83
Merge pull request #3126 from matrix-org/bwindels/caret-refactoring
...
Editor caret improvements
2019-06-21 15:02:41 +00:00
32bf4588dd
Center tooltip along top or bottom of target
...
This adjusts the positioning to work more the way we want:
* Tooltip is position on the top or bottom edge of the target depending on where
space is available
* Tooltip and chevron are centered
In addition, more bits borrowed from `ContextualMenu` are not needed, so they
have been removed for simplicity.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
6dcdad028e
Clone ContextualMenu to InteractiveTooltip
...
As part of reactions and editing work, we're adding a new style of tooltip that
allows interacting with the content of the tooltip. `ContextualMenu` is closest
out of the things we have today, but it doesn't position in quite the way we
want and it's already quite complex.
To get started, let's first clone that to a new `InteractiveTooltip`.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
cf0799289d
Disable left/right arrow navigating completions for now
...
as the autocomplete is now very eager to appear, this breaks
caret navigation when typing e.g. anything with a colon.
Ideally, we should make the AC less eager to appear,
but this is a quick fix for now.
2019-06-21 13:48:52 +02:00
dea412c906
Add file size to UploadConfirmDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-21 09:03:28 +01:00
2a0660c545
Merge pull request #3123 from matrix-org/travis/sas-timeouts
...
Consider cancelled verifications when mounting IncomingSasDialog
2019-06-20 14:29:20 -06:00
0f8dd102bf
Move early-cancel stuff to constructor
2019-06-20 14:17:06 -06:00
bf443149b5
Make the verification cancelled dialog say OK instead of Cancel
...
Fixes https://github.com/vector-im/riot-web/issues/9306
Includes unexpected cleanup of i18n
2019-06-19 15:07:45 -06:00
ff3c52a736
Consider cancelled verifications when mounting IncomingSasDialog
...
The cancellation can be because of a background problem, or because the user received another verification request from the same user. The cancel function does get called, however due to the speed of our dialog handling the state ends up being lost forever. Instead of trying to de-layer dialogs, this just fastforwards the whole dialog to "cancelled" on mount if required.
Fixes https://github.com/vector-im/riot-web/issues/10118
2019-06-19 14:59:59 -06:00
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button
...
Fix casing of TooltipButton
2019-06-19 19:18:15 +01:00
b16bc0178a
insert manually, as insertHTML command moves caret inconsistently
...
across browsers
2019-06-19 17:42:18 +02:00
0e6f401b62
copyright
2019-06-19 11:48:47 +01:00
c57d93702a
De-duplicate notif badge code
...
We had two different places we were deciding whether to show a badge.
Let's just have one.
2019-06-19 11:46:24 +01:00
bb4b5d7798
TooltipButton rename step 2 of 2
2019-06-19 11:32:03 +01:00
ab4c5f0152
TooltipButton rename step 1 of 2
2019-06-19 11:30:37 +01:00
4ec7a8ddff
Fix casing of TooltipButton
...
My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems.
2019-06-19 11:26:13 +01:00
9591e6b0d3
Merge pull request #3071 from matrix-org/t3chguy/authentication_password_field
...
Switch ugly password boxes to Field or styled input
2019-06-19 09:31:11 +01:00
bb97653455
Merge pull request #3113 from matrix-org/bwindels/mediadeviceslabels
...
Provide default name if device label is missing
2019-06-18 16:44:43 +00:00
63fba611c0
Merge pull request #3108 from matrix-org/bwindels/edit-room-notif-pill
...
Support @room pills while editing
2019-06-18 16:43:14 +00:00
7b514b0573
Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls
...
Defer scalar API calls until they are needed
2019-06-18 08:17:21 -06:00
b6ca0ea6bf
Appease the linter
2019-06-18 08:01:38 -06:00
be37332bb0
Further simplify usage of integrations
2019-06-18 07:55:43 -06:00
f95f194b6a
keep old arrow-up behaviour when editing is not enabled
...
also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise
2019-06-18 11:49:36 +02:00
32840fc274
Merge pull request #3098 from matrix-org/t3chguy/restore_composer_history
...
Restore Composer History under shift-up & down
2019-06-18 08:59:11 +00:00
5e7b4564cf
Merge pull request #3114 from matrix-org/dbkr/allow_server_change_if_dead
...
Allow changing server if validation has failed
2019-06-18 09:37:31 +01:00
b0d340f578
Merge pull request #3109 from matrix-org/t3chguy/upload_all_button
...
Add Upload All button to UploadConfirmDialog
2019-06-17 18:06:15 -06:00
8f6e8c1ec7
Appease the linter
2019-06-17 15:51:14 -06:00
974a11ed20
Defer scalar auth in AppsDrawer to widgets/manager dialog
2019-06-17 15:39:32 -06:00
d2d0cb2e9e
Port AppTile (widgets) over to new integration manager dialog props
2019-06-17 15:34:30 -06:00
f699fed720
Defer sticker picker scalar auth to integration manager dialog
...
or when needed, instead of up front.
2019-06-17 15:30:24 -06:00
a5f296457f
Make the Manage Integrations Button defer scalar auth to the manager
...
This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.
By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog.
2019-06-17 15:29:28 -06:00
7c80355ea7
Convert IntegrationsManager to a class
2019-06-17 15:26:58 -06:00
10f6abfe17
Allow changing server if validation has failed
...
Show the server config section if there's an error and fix an if
case where we forgot to un-set the busy flag
2019-06-17 18:47:20 +01:00
a35c9ea585
provide default for missing device labels
2019-06-17 19:39:40 +02:00
c68074f532
Fix display of canonicalAlias in group room info
...
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
2019-06-16 21:52:25 +02:00
2fc2e32e60
Add Upload All button to UploadConfirmDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-16 11:43:13 +01:00
fbe8d1c89b
Switch DeactivateAccountDialog to Field and cleanups
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-16 10:42:46 +01:00
3563b83762
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/authentication_password_field
2019-06-16 10:31:30 +01:00
03c37821f6
clean up onVerticalArrow
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-15 15:10:34 +01:00
497ba1ecd4
prevent @room pills being applied multiple times when rerendering
2019-06-14 18:28:44 +02:00
eb4ff50c3c
do parts creation only in PartCreator to not scatter dependencies
2019-06-14 18:28:44 +02:00
6a10f0068d
Use Alt-UP/DOWN for Composer History instead of random room change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-14 12:26:52 +01:00
876acc0f76
Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history
...
# Conflicts:
# src/components/views/rooms/MessageComposerInput.js
2019-06-14 12:26:05 +01:00
3cfdd518ee
detect emote when sending (and trim "/me " for content)
2019-06-14 11:02:20 +02:00
06a11f4d45
Random blank lines
2019-06-13 18:31:04 +01:00
e884cccabe
Allow changing servers on nonfatal errors
...
Fixes https://github.com/vector-im/riot-web/issues/10016
2019-06-13 18:23:33 +01:00
48f5cf1523
Merge pull request #2966 from npny/npny/autocomplete-arrow-keys
...
Allow arrow keys navigation in autocomplete list
2019-06-13 15:38:36 +00:00
3d944b715e
Merge pull request #3097 from matrix-org/bwindels/edit-unsent
...
Edit unsent messages
2019-06-13 14:00:46 +00:00
acb813372c
Restore Composer History under shift-up & down
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-12 21:32:47 +01:00
41e41269dc
use EditorStateTransfer to pass on state to newly mounted editor
2019-06-12 18:52:34 +02:00
413bff084c
Merge pull request #3087 from matrix-org/jryans/context-menu-clipping
...
Align message context menu to right and vertically where space available
2019-06-12 10:19:47 +01:00
a47a46bd9f
Merge pull request #3084 from matrix-org/jryans/update-action-bar-on-decrypt
...
Recheck message actions on decrypt
2019-06-10 16:53:35 +01:00
f89a4b688f
Align message context menu vertically
...
This aligns the message context menu on either the top or the bottom of the
button that triggers, depending on which side has more space available to fit
the menu.
Fixes https://github.com/vector-im/riot-web/issues/9624
2019-06-10 16:29:22 +01:00
0355c91797
Align message context menu to right
...
This changes the message context menu to align the right edge of the menu with
the right edge of the button that opens it, which should keep all menu options
inside the viewport, even if they are very wide.
Part of https://github.com/vector-im/riot-web/issues/9624
2019-06-10 16:14:29 +01:00
f620b712fb
Merge pull request #3083 from matrix-org/dbkr/remember_invited_room
...
Remember we were trying to accept an invite
2019-06-10 13:31:12 +01:00
73d2d78c33
Recheck message actions on decrypt
...
This changes the message action bar to force an update after an event decrypts,
since it's quite likely that changes the set of available actions.
Fixes https://github.com/vector-im/riot-web/issues/9991
2019-06-10 12:49:37 +01:00
80812db466
Remember we were trying to accept an invite
...
When the user was on an invite page and clicked the sign up/sign in
buttons, remember that invite so we can show it again after they're
done signing up/in.
https://github.com/vector-im/riot-web/issues/9816
2019-06-10 10:24:06 +01:00
a1d0b8c5f3
Merge pull request #3080 from matrix-org/jryans/lowercase-letters
...
Clarify that only lowercase letters are allowed
2019-06-07 20:40:55 +01:00
795a273e26
Merge pull request #3067 from matrix-org/travis/fail-fast-but-not-too-fast
...
Fail more softly on homeserver liveliness errors
2019-06-07 07:43:45 -06:00
b2a9402d3f
Clarify that only lowercase letters are allowed
...
We only allow lowercase letters in localparts.
Fixes https://github.com/vector-im/riot-web/issues/9983
2019-06-07 13:57:30 +01:00
6daf5a1d9b
Merge pull request #3076 from matrix-org/t3chguy/fix_community_add_room
...
Fix AddressPickerDialog adding wrong entry to selected list case
2019-06-06 17:25:26 -06:00
b2c39ba842
Fix AddressPickerDialog adding wrong entry to selected list case
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-07 00:00:38 +01:00
b365c9dfe6
Merge pull request #3074 from matrix-org/dbkr/fix_email_invite_address_match_check
...
Fix email invites address-match checking
2019-06-06 15:06:36 +01:00
9816fe0ed7
Fix email invites address-match checking
...
Riot was always saying the email address that the invite was sent
to was not associated with your account.
Two fixes here:
1. We mounted RoomPreviewBar with no invitedEmail prop and then
changed the prop later, but RoomPreviewBar only checked for it
on mount. Make sure we re-check when the props change.
2. Pass oobData through RoomPreviewBar because we need to pass it
to the RoomAvatar for 3pid invites.
https://github.com/vector-im/riot-web/issues/9816
2019-06-06 14:34:57 +01:00
aec3950a71
Merge pull request #3073 from matrix-org/jryans/twemoji-license
...
Add license info for Twemoji
2019-06-06 14:27:50 +01:00
Bruno Windels