Commit Graph

16120 Commits (be37332bb07ef59822ba0c3fbe7444172db830c9)

Author SHA1 Message Date
Travis Ralston be37332bb0 Further simplify usage of integrations 2019-06-18 07:55:43 -06:00
Travis Ralston d5db0077ed Remove unused imports 2019-06-17 15:53:11 -06:00
Travis Ralston 8f6e8c1ec7 Appease the linter 2019-06-17 15:51:14 -06:00
Travis Ralston d58ab8e6d0 Remove excessive scalar auth checks in manager util class 2019-06-17 15:50:09 -06:00
Travis Ralston 974a11ed20 Defer scalar auth in AppsDrawer to widgets/manager dialog 2019-06-17 15:39:32 -06:00
Travis Ralston d2d0cb2e9e Port AppTile (widgets) over to new integration manager dialog props 2019-06-17 15:34:30 -06:00
Travis Ralston 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
Travis Ralston ebabc5238d Port integration manager class to new dialog props 2019-06-17 15:30:01 -06:00
Travis Ralston 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
Travis Ralston 6cc443cd01 spelling 2019-06-17 15:27:35 -06:00
Travis Ralston 7c80355ea7 Convert IntegrationsManager to a class 2019-06-17 15:26:58 -06:00
David Baker fac6dc25f6
Merge pull request #3112 from matrix-org/dbkr/reenable_register_button
Re-enable register button
2019-06-17 18:45:39 +01:00
Bruno Windels 536f78eaf5
Merge pull request #3111 from matrix-org/bwindels/fix-register-layout
keep mx_Field stretching
2019-06-17 17:42:52 +00:00
Bruno Windels 872c1acdea keep mx_Field stretching 2019-06-17 18:29:03 +02:00
David Baker 3f6bb0c7ca Use default cursor for disabled submit button 2019-06-17 16:57:13 +01:00
David Baker 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
David Baker 2eef3d610e
Merge pull request #3107 from matrix-org/dbkr/multispinner
Fix double-spinner
2019-06-17 09:27:45 +01:00
Michael Telatynski 94f6907db5
Merge pull request #3110 from z3ntu/canonical_alias
Fix display of canonicalAlias in group room info
2019-06-17 08:11:27 +01:00
Luca Weiss 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
David Baker 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
David Baker 4ce72fdffa
Merge pull request #3106 from matrix-org/dbkr/resurrect_riot_bot
Fix welcome user
2019-06-14 17:20:31 +01:00
Bruno Windels 638b5c6d31
Merge pull request #3105 from matrix-org/bwindels/edit-emotes
Support editing emote messages
2019-06-14 15:47:29 +00:00
David Baker 794b04b89a take the debugging out 2019-06-14 16:41:30 +01:00
David Baker 30726d6cf9 Pull out welcome user chat code to a separate function
also expand on comment
2019-06-14 16:29:26 +01:00
David Baker 929e9dc653 Don't forget to show the homepage if no welcome user 2019-06-14 16:04:09 +01:00
David Baker 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
Bruno Windels e4090d6b2e
Merge pull request #3104 from matrix-org/t3chguy/mx_Field_flex_1
Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more
2019-06-14 09:23:36 +00:00
Bruno Windels 6ffe910b47
Merge pull request #3099 from matrix-org/t3chguy/MemberInfo_long_mxid
Use overflow on MemberInfo name/mxid so that the back button stays
2019-06-14 09:22:58 +00:00
Bruno Windels 3cfdd518ee detect emote when sending (and trim "/me " for content) 2019-06-14 11:02:20 +02:00
Bruno Windels aecfbce55c prepend "/me " to emotes when parsing them to edit 2019-06-14 11:01:52 +02:00
Bruno Windels 0b17812b9c allow editing emotes 2019-06-14 11:01:34 +02:00
Michael Telatynski 1090b7d912 Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-13 23:48:47 +01:00
David Baker 2a7301fa8f
Merge pull request #3102 from matrix-org/dbkr/nonfatal_errors_are_not_fatal
Allow changing servers on nonfatal errors
2019-06-13 18:39:43 +01:00
David Baker 06a11f4d45 Random blank lines 2019-06-13 18:31:04 +01:00
David Baker 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
David Baker 446b20c454
Merge pull request #3101 from matrix-org/dbkr/simplify_email_reg
Simplify email registration
2019-06-13 18:22:30 +01:00
David Baker 81327264f7 Remove unused inhibitlogin param
and fix docs.
2019-06-13 17:44:00 +01:00
Bruno Windels 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
David Baker 048d8d2ec7 Simplify email registration
You now don't get automatically logged in after finishing
registration. This makes a whole class of failures involving race
conditions and multiple devices impossible.

https://github.com/vector-im/riot-web/issues/9586
2019-06-13 16:24:09 +01:00
Bruno Windels 3d944b715e
Merge pull request #3097 from matrix-org/bwindels/edit-unsent
Edit unsent messages
2019-06-13 14:00:46 +00:00
Bruno Windels 8b16f91b3d fix karma tests? 2019-06-13 15:50:23 +02:00
Bruno Windels 89cc45892c fix grammar fail 2019-06-13 13:28:21 +02:00
Michael Telatynski 4fda6c21de Use overflow on MemberInfo name/mxid so that the back button stays
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-12 21:58:10 +01:00
David Baker c6b1bd4d14
Merge pull request #3096 from matrix-org/dbkr/use_server_urls_from_query_please
Fix registration with email + non-default HS
2019-06-12 19:19:40 +01:00
David Baker 1139f68de8 Pass in object of the right type 2019-06-12 18:11:58 +01:00
Bruno Windels d40f49e2c2 fix lint 2019-06-12 19:09:27 +02:00
Bruno Windels 41e41269dc use EditorStateTransfer to pass on state to newly mounted editor 2019-06-12 18:52:34 +02:00
David Baker 10377b42e9 Fix registration with email + non-default HS
We were ignoring the hs/is from the query parameters so after
clicking the link, the new client tried to use the wrong server.

Broken by https://github.com/matrix-org/matrix-react-sdk/pull/2941
Fixes https://github.com/vector-im/riot-web/issues/9659
2019-06-12 17:42:09 +01:00
Bruno Windels e674f39e3b support (de)serializing parts with other dependencies than text 2019-06-12 18:32:32 +02:00
Bruno Windels 678fd37549 helper class to preserve editor state between remounting the editor 2019-06-12 18:29:21 +02:00