OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
16,157 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

16157 Commits (9591e6b0d30f7f16d08aae06e51853329ab6e224)

Author SHA1 Message Date
Bruno Windels eb4ff50c3c do parts creation only in PartCreator to not scatter dependencies 2019-06-14 18:28:44 +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
Michael Telatynski 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
Michael Telatynski 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
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
Michael Telatynski acb813372c Restore Composer History under shift-up & down 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-12 21:32:47 +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
J. Ryan Stinnett 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
J. Ryan Stinnett 5280d8469b Add comment 2019-06-12 17:23:11 +01:00
J. Ryan Stinnett 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
David Baker 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
David Baker 5e775e24fb Console log more helpfully 
Appending objects to strings isn't really useful
 2019-06-12 14:04:08 +01:00
Bruno Windels d13b3aa16c don't block unsent events from being edited 2019-06-12 11:20:21 +02:00
J. Ryan Stinnett 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
Bruno Windels f78aeae83a also consider pending events when looking for next/prev event to edit 2019-06-12 11:19:17 +02:00
J. Ryan Stinnett 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
J. Ryan Stinnett 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
J. Ryan Stinnett 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
J. Ryan Stinnett 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
David Baker f07aff2816
Merge pull request #3091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-06-11 14:16:12 +01:00
Weblate 2a028e9294 Merge branch 'origin/develop' into Weblate. 2019-06-11 12:47:02 +00:00
Szimszon 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