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
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
f7c03acb58
Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo
...
Blend pending redactions
2019-06-18 13:09:25 +00:00
c4fc2a8089
remove redundant localecho part from method name
2019-06-18 14:57:58 +02:00
02c9e29937
use renamed method that also takes local redactions into account now
2019-06-18 13:47:33 +02: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
1db505c667
comment typo
2019-06-18 09:50:31 +02:00
3119feaa17
whitespace
2019-06-18 09:48:25 +02:00
47579f37e8
clarify why its always safe to not append @room at end while parsing
2019-06-18 08:40:58 +02: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
d5db0077ed
Remove unused imports
2019-06-17 15:53:11 -06:00
8f6e8c1ec7
Appease the linter
2019-06-17 15:51:14 -06:00
d58ab8e6d0
Remove excessive scalar auth checks in manager util class
2019-06-17 15:50:09 -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
ebabc5238d
Port integration manager class to new dialog props
2019-06-17 15:30:01 -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
6cc443cd01
spelling
2019-06-17 15:27:35 -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
e3bf4a0b8e
Re-enable register button on change to working HS
...
Register button disabling is done via serverErrorIsFatal so we need
to reset this on a successful validation.
https://github.com/vector-im/riot-web/issues/10029
2019-06-17 16:27:35 +01:00
2eef3d610e
Merge pull request #3107 from matrix-org/dbkr/multispinner
...
Fix double-spinner
2019-06-17 09:27:45 +01: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
03c37821f6
clean up onVerticalArrow
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-06-15 15:10:34 +01:00
d9e62b54fc
also support deserializing at-room-pill when transferring editor state
2019-06-14 18:42:30 +02:00
497ba1ecd4
prevent @room pills being applied multiple times when rerendering
2019-06-14 18:28:44 +02:00
78971f168f
create AtRoomPill when autocomplete returns @room
2019-06-14 18:28:44 +02:00
65d56d1490
transform @room to AtRoomPill while deserializing html to md
2019-06-14 18:28:44 +02:00
63b11f5001
(de)serialize at-room-pills just like pill-candidate (no html needed)
2019-06-14 18:28:44 +02:00
dfec5058c5
support creating @room pills in partcreator
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
4c036c98ee
Fix double-spinner
...
On registering, we showed a spinner, and then another spinner on
top of the spinner, which led to an interesting spinner-in-box
effect.
Suppress the second type of spinner when we know we already have one.
2019-06-14 17:21:07 +01:00
4ce72fdffa
Merge pull request #3106 from matrix-org/dbkr/resurrect_riot_bot
...
Fix welcome user
2019-06-14 17:20:31 +01:00
794b04b89a
take the debugging out
2019-06-14 16:41:30 +01:00
30726d6cf9
Pull out welcome user chat code to a separate function
...
also expand on comment
2019-06-14 16:29:26 +01:00
929e9dc653
Don't forget to show the homepage if no welcome user
2019-06-14 16:04:09 +01:00
8fa50b26a6
Fix welcome user
...
https://github.com/matrix-org/matrix-react-sdk/pull/3101 meant we
don't get logged straight in after registering if using an email
address, but this was the point at which we made a chat with the
welcome user. Instead, set a flag in memory that we should try &
make a chat with the welcome user for that user ID if we get a
session for them.
Of course, if the user logs in on both tabs, this would mean each
would make a chat with the welcome user (although actually this
was a problem with the old code too). Check our m.direct to see if
we've started a chat with the welcome user before making one (which
also means we have to make sure the cached sync is up to date...
see comments).
2019-06-14 15:31:19 +01: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
aecfbce55c
prepend "/me " to emotes when parsing them to edit
2019-06-14 11:01:52 +02:00
J. Ryan Stinnett