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
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
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
446b20c454
Merge pull request #3101 from matrix-org/dbkr/simplify_email_reg
...
Simplify email registration
2019-06-13 18:22:30 +01:00
81327264f7
Remove unused inhibitlogin param
...
and fix docs.
2019-06-13 17:44:00 +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
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
3d944b715e
Merge pull request #3097 from matrix-org/bwindels/edit-unsent
...
Edit unsent messages
2019-06-13 14:00:46 +00:00
8b16f91b3d
fix karma tests?
2019-06-13 15:50:23 +02:00
89cc45892c
fix grammar fail
2019-06-13 13:28:21 +02:00
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
1139f68de8
Pass in object of the right type
2019-06-12 18:11:58 +01:00
d40f49e2c2
fix lint
2019-06-12 19:09:27 +02:00
41e41269dc
use EditorStateTransfer to pass on state to newly mounted editor
2019-06-12 18:52:34 +02:00
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
e674f39e3b
support (de)serializing parts with other dependencies than text
2019-06-12 18:32:32 +02:00
678fd37549
helper class to preserve editor state between remounting the editor
2019-06-12 18:29:21 +02:00
f981d72083
Merge pull request #3095 from matrix-org/jryans/read-marker-action-bar
...
Raise action bar above read marker
2019-06-12 17:23:36 +01:00
5280d8469b
Add comment
2019-06-12 17:23:11 +01:00
4d8809882f
Raise action bar above read marker
...
Use `z-index` to ensure the action bar appears above over things, like the read
marker.
Fixes https://github.com/vector-im/riot-web/issues/9619
2019-06-12 14:41:49 +01:00
c425eb83ca
Merge pull request #3094 from matrix-org/dbkr/console_log_more_betterer
...
Console log more helpfully
2019-06-12 14:40:45 +01:00
5e775e24fb
Console log more helpfully
...
Appending objects to strings isn't really useful
2019-06-12 14:04:08 +01:00
d13b3aa16c
don't block unsent events from being edited
2019-06-12 11:20:21 +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
f78aeae83a
also consider pending events when looking for next/prev event to edit
2019-06-12 11:19:17 +02:00
3dee682048
Merge pull request #3093 from matrix-org/jryans/is-down-blocks-reg
...
Allow registration to submit for non-fatal errors
2019-06-12 10:11:16 +01:00
b8ed731c89
Allow registration to submit for non-fatal errors
...
This allows you to proceed with registration even if the IS is down, for
example.
Fixes https://github.com/vector-im/riot-web/issues/10018
2019-06-11 18:01:27 +01:00
3836a3e2e2
Merge pull request #3092 from matrix-org/jryans/full-mxid-default-hs
...
Clear the login busy state after .well-known discovery
2019-06-11 15:52:21 +01:00
21099052fc
Clear the login busy state after .well-known discovery
...
This always clear the login busy state after .well-known discovery without
waiting for the resulting server config. This is important for the case where
the HS that a full MXID resolves to matches the default HS, as without it we'd
be stuck in a busy state forever.
Fixes https://github.com/vector-im/riot-web/issues/10014
2019-06-11 15:41:47 +01:00
f07aff2816
Merge pull request #3091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-06-11 14:16:12 +01:00
2a028e9294
Merge branch 'origin/develop' into Weblate.
2019-06-11 12:47:02 +00:00
7fe82ae1e8
Translated using Weblate (Hungarian)
...
Currently translated at 99.8% (1644 of 1647 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-06-11 12:47:02 +00:00
892427c7cc
Translated using Weblate (French)
...
Currently translated at 100.0% (1647 of 1647 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-06-11 12:47:02 +00:00
bf09738786
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1647 of 1647 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-06-11 12:47:01 +00:00
acb5372b7c
Merge pull request #3090 from matrix-org/dbkr/registration_matrixclient_sometimes_isnt_there
...
Fix registration after fail-fast
2019-06-11 13:46:56 +01:00
7602d76723
fix test
2019-06-11 13:16:49 +01:00
a6c5ac669b
Don't show spinner once liveness check has failed
...
We're not doing anything at that point so it's a lie
2019-06-11 12:10:44 +01:00
5eccd14120
Fix registration after fail-fast
...
The lineness checks meant that we could no longer assume we always
had a matrix client, so don't assume we do.
Fixes https://github.com/vector-im/riot-web/issues/10011
2019-06-11 12:02:14 +01:00
8e32ea5e9f
Merge branch 'origin/develop' into Weblate.
2019-06-11 09:42:32 +00:00
e1a1492f6f
Merge pull request #3085 from matrix-org/dbkr/one_request_at_a_time_two
...
Use setBusy interface of js-sdk interactive auth
2019-06-11 10:42:27 +01:00
c8ff7fd67a
Merge branch 'origin/develop' into Weblate.
2019-06-11 09:40:58 +00:00
553ce13e36
Translated using Weblate (West Flemish)
...
Currently translated at 100.0% (1643 of 1643 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-06-11 09:40:58 +00:00
2a2f2ef15c
Merge pull request #3088 from matrix-org/travis/less-fatal-identity
...
Don't handle identity server failure as fatal, and use the right message
2019-06-11 10:40:53 +01:00
7b3d1ad08d
Typo
2019-06-11 10:29:00 +01:00
bd3237500f
Fix submit disabled condition
2019-06-10 20:24:06 -06:00
aacb942d57
Don't handle identity server failure as fatal, and use the right message
...
Fixes https://github.com/vector-im/riot-web/issues/10002
2019-06-10 19:28:32 -06:00
David Baker