PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
16346 commits 1 branch 0 tags 338 MiB
Commit graph

16346 commits

This branch
This branch
All branches
Author SHA1 Message Date
natowi
4a0471eba7 Translated using Weblate (German) 
Currently translated at 87.3% (1440 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-06-17 07:11:32 +00:00
BenjaminVettori
8c538f2faf Translated using Weblate (German) 
Currently translated at 87.3% (1440 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-06-17 07:11:32 +00: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
Vitaly Lipatov
ac201a8aff Translated using Weblate (Russian) 
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/ru/
 2019-06-16 21:28:59 +00:00
Travis Ralston
34702d7214 Translated using Weblate (German) 
Currently translated at 87.1% (1437 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-06-16 21:28:57 +00:00
Jeff Huang
4ffca59456 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-06-16 21:28:57 +00: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
Michael Telatynski
2fc2e32e60 Add Upload All button to UploadConfirmDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-16 11:43:13 +01:00
Michael Telatynski
fbe8d1c89b Switch DeactivateAccountDialog to Field and cleanups 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-16 10:42:46 +01:00
Michael Telatynski
3563b83762 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/authentication_password_field 2019-06-16 10:31:30 +01:00
Michael Telatynski
03c37821f6 clean up onVerticalArrow 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-15 15:10:34 +01:00
Bruno Windels
d9e62b54fc also support deserializing at-room-pill when transferring editor state 2019-06-14 18:42:30 +02:00
Bruno Windels
497ba1ecd4 prevent @room pills being applied multiple times when rerendering 2019-06-14 18:28:44 +02:00
Bruno Windels
78971f168f create AtRoomPill when autocomplete returns @room 2019-06-14 18:28:44 +02:00
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