OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
16,332 Commits
222 Branches
563 Tags
474 MiB
Commit Graph

16332 Commits (3873dc724aaa4072d367e0980293d11e33239b2a)

Author SHA1 Message Date
Bruno Windels 65d56d1490 transform @room to AtRoomPill while deserializing html to md 2019-06-14 18:28:44 +02:00
Bruno Windels 63b11f5001 (de)serialize at-room-pills just like pill-candidate (no html needed) 2019-06-14 18:28:44 +02:00
Bruno Windels dfec5058c5 support creating @room pills in partcreator 2019-06-14 18:28:44 +02:00
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
Weblate df17c61fab Merge branch 'origin/develop' into Weblate. 2019-06-14 16:20:36 +00: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
Weblate 431de3e698 Merge branch 'origin/develop' into Weblate. 2019-06-14 15:47:34 +00:00
Nathan Follens ad1cd085d5 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-06-14 15:47:34 +00:00
Nathan Follens df7a0c6d45 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-06-14 15:47:33 +00: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
Weblate 25acd6fdeb Merge branch 'origin/develop' into Weblate. 2019-06-14 09:23:40 +00: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
Weblate 275c750d61 Merge branch 'origin/develop' into Weblate. 2019-06-14 09:23:06 +00:00
Le Dang Trung a311374985 Translated using Weblate (Vietnamese) 
Currently translated at 0.4% (7 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vi/
 2019-06-14 09:23:06 +00:00
Karol Kosek 15d949b405 Translated using Weblate (Polish) 
Currently translated at 74.4% (1228 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-06-14 09:23:06 +00:00
Kévin C 18afdf9d07 Translated using Weblate (French) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-14 09:23:05 +00:00
Slavi Pantaleev 965985619e Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-06-14 09:23:05 +00:00
Osoitz 9b16216931 Translated using Weblate (Basque) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-14 09:23:04 +00:00
Besnik Bleta c2a03893dc Translated using Weblate (Albanian) 
Currently translated at 99.6% (1644 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-14 09:23:04 +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
Le Dang Trung 8232553e36 Added translation using Weblate (Vietnamese) 2019-06-14 08:02:55 +00: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
Weblate 3c4d21c4c4 Merge branch 'origin/develop' into Weblate. 2019-06-13 17:39:48 +00: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
Weblate 8f4b27d517 Merge branch 'origin/develop' into Weblate. 2019-06-13 17:22:37 +00:00
random 357f8b5893 Translated using Weblate (Italian) 
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/it/
 2019-06-13 17:22:36 +00:00
Stanislav Lukeš acaadaba11 Translated using Weblate (Czech) 
Currently translated at 99.9% (1646 of 1647 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-06-13 17:22:36 +00:00
Osoitz abb77de78b Translated using Weblate (Basque) 
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/eu/
 2019-06-13 17:22:35 +00:00
Besnik Bleta 6c5b205324 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1641 of 1647 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-13 17:22:34 +00: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