mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
16002 commits 216 branches 561 tags 417 MiB
Commit graph

16002 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
d0ba9264d8 Merge branch 'origin/develop' into Weblate. 2019-06-07 19:41:31 +00:00
J. Ryan Stinnett
7790eeb42f
Merge pull request #3081 from matrix-org/jryans/reactions-rm-highlight 
Remove highlight from reactions
 2019-06-07 20:41:26 +01:00
Weblate
27bfa58449 Merge branch 'origin/develop' into Weblate. 2019-06-07 19:41:00 +00:00
J. Ryan Stinnett
a1d0b8c5f3
Merge pull request #3080 from matrix-org/jryans/lowercase-letters 
Clarify that only lowercase letters are allowed
 2019-06-07 20:40:55 +01:00
Weblate
4d59cff271 Merge branch 'origin/develop' into Weblate. 2019-06-07 19:26:34 +00:00
Nathan Follens
4aae995986 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-07 19:26:34 +00:00
Szimszon
8d8bdd37f5 Translated using Weblate (Hungarian) 
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/hu/
 2019-06-07 19:26:33 +00:00
Kévin C
7edca52ba2 Translated using Weblate (French) 
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/fr/
 2019-06-07 19:26:33 +00:00
Nathan Follens
22d52223ca Translated using Weblate (Dutch) 
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/nl/
 2019-06-07 19:26:32 +00:00
Travis Ralston
10c81b4208
Merge pull request #3082 from matrix-org/travis/fail-less-fast-on-is 
Don't handle identity server liveliness errors as fatal
 2019-06-07 13:26:28 -06:00
Travis Ralston
f238bbb6af Merge branch 'develop' into jryans/reactions-rm-highlight 2019-06-07 13:20:45 -06:00
Travis Ralston
758b3394a4 Don't handle identity server liveliness errors as fatal 
An invalid IS causes an invalid HS, so we switch the order of the checks. Additionally, we adjust the HS result so that it appears like a liveliness error for the IS, allowing the app to continue normally.
 2019-06-07 13:14:43 -06:00
J. Ryan Stinnett
3320fd9929 Remove highlight from reactions 
This explicitly sets `color` for the reactions row to ensure it's always the fg
colour, even if the event is highlighted.

Fixes https://github.com/vector-im/riot-web/issues/9697
 2019-06-07 15:57:34 +01:00
Weblate
0410b983b2 Merge branch 'origin/develop' into Weblate. 2019-06-07 14:24:21 +00:00
Jeff Huang
20c2ed5c68 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-06-07 14:24:21 +00:00
Hubert Chathi
41cbfe0d27
Merge pull request #3078 from uhoreg/truncate_displayname 
truncate long display names in timeline headings
 2019-06-07 10:24:17 -04:00
Weblate
986e548612 Merge branch 'origin/develop' into Weblate. 2019-06-07 13:43:51 +00:00
Walter
9bfe95a8e7 Translated using Weblate (Russian) 
Currently translated at 100.0% (1641 of 1641 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-06-07 13:43:51 +00:00
Travis Ralston
795a273e26
Merge pull request #3067 from matrix-org/travis/fail-fast-but-not-too-fast 
Fail more softly on homeserver liveliness errors
 2019-06-07 07:43:45 -06:00
Travis Ralston
59ba5fe62a Don't block submit if the server is dead 
But still check so we can clear any errors, maybe
 2019-06-07 07:36:46 -06:00
Travis Ralston
120123bcb1 Allow submit on forgot password page 2019-06-07 07:27:15 -06:00
J. Ryan Stinnett
b2a9402d3f Clarify that only lowercase letters are allowed 
We only allow lowercase letters in localparts.

Fixes https://github.com/vector-im/riot-web/issues/9983
 2019-06-07 13:57:30 +01:00
Hubert Chathi
4ab491f823 truncate long display names in timeline headings 
partial fix for vector-im/riot-web#5739
 2019-06-06 22:41:10 -04:00
Weblate
d3829ac625 Merge branch 'origin/develop' into Weblate. 2019-06-06 23:25:30 +00:00
Travis Ralston
6daf5a1d9b
Merge pull request #3076 from matrix-org/t3chguy/fix_community_add_room 
Fix AddressPickerDialog adding wrong entry to selected list case
 2019-06-06 17:25:26 -06:00
Weblate
9c01fbecd2 Merge branch 'origin/develop' into Weblate. 2019-06-06 23:16:58 +00:00
Michael Telatynski
3f6b266256
Merge pull request #3077 from matrix-org/t3chguy/change_keybind 
change profile keybind to backtick from i due to italics conflict
 2019-06-07 00:16:54 +01:00
Michael Telatynski
bea4f557a1 change profile keybind to backtick from i due to italics conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-07 00:08:51 +01:00
Michael Telatynski
b2c39ba842 Fix AddressPickerDialog adding wrong entry to selected list case 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-07 00:00:38 +01:00
Weblate
4fdac7bddf Merge branch 'origin/develop' into Weblate. 2019-06-06 18:52:07 +00:00
David Baker
a591a939fd
Merge pull request #3075 from matrix-org/dbkr/wait_for_token_request 
Look busy whilst requesting the email token
 2019-06-06 19:52:02 +01:00
David Baker
aba329cab5 Look busy whilst requesting the email token 
We need to wait for it to finish before letting the user start
completing the steps since if it fails, we can't complete the auth.
 2019-06-06 19:41:57 +01:00
Travis Ralston
d59ad605a6 Allow the login form to be submitted, and clarify other things 2019-06-06 12:18:41 -06:00
Weblate
6ff4595f91 Merge branch 'origin/develop' into Weblate. 2019-06-06 14:06:41 +00:00
David Baker
b365c9dfe6
Merge pull request #3074 from matrix-org/dbkr/fix_email_invite_address_match_check 
Fix email invites address-match checking
 2019-06-06 15:06:36 +01:00
David Baker
9816fe0ed7 Fix email invites address-match checking 
Riot was always saying the email address that the invite was sent
to was not associated with your account.

Two fixes here:
 1. We mounted RoomPreviewBar with no invitedEmail prop and then
    changed the prop later, but RoomPreviewBar only checked for it
    on mount. Make sure we re-check when the props change.
 2. Pass oobData through RoomPreviewBar because we need to pass it
    to the RoomAvatar for 3pid invites.

https://github.com/vector-im/riot-web/issues/9816
 2019-06-06 14:34:57 +01:00
Weblate
589f0f4bed Merge branch 'origin/develop' into Weblate. 2019-06-06 13:27:54 +00:00
J. Ryan Stinnett
aec3950a71
Merge pull request #3073 from matrix-org/jryans/twemoji-license 
Add license info for Twemoji
 2019-06-06 14:27:50 +01:00
Weblate
1f09190f49 Merge branch 'origin/develop' into Weblate. 2019-06-06 13:22:26 +00:00
J. Ryan Stinnett
881842a737
Merge pull request #3072 from matrix-org/jryans/hover-read-avatars 
Show read receipts on top of message
 2019-06-06 14:22:22 +01:00
J. Ryan Stinnett
20b57b855b Add license info for Twemoji 
Fixes https://github.com/vector-im/riot-web/issues/9930
 2019-06-06 14:20:13 +01:00
J. Ryan Stinnett
4b18bb17fe Show read receipts on top of message 
This allows you to view a long expanded set of read receipts even while hovering
a message.

Fixes https://github.com/vector-im/riot-web/issues/7608
 2019-06-06 14:02:35 +01:00
Weblate
09923d631f Merge branch 'origin/develop' into Weblate. 2019-06-06 11:39:06 +00:00
random
d076f7ce5c Translated using Weblate (Italian) 
Currently translated at 99.9% (1639 of 1641 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-06-06 11:39:06 +00:00
Michael Telatynski
db495e7162
Merge pull request #3070 from matrix-org/t3chguy/fuzzier-emojis 
Be somewhat fuzzier when matching emojis to complete on space
 2019-06-06 12:39:00 +01:00
Weblate
01d50c0898 Merge branch 'origin/develop' into Weblate. 2019-06-06 08:59:39 +00:00
J. Ryan Stinnett
8d79c73019
Merge pull request #3069 from matrix-org/jryans/single-emoji 
Restrict reactions to a single emoji
 2019-06-06 09:59:33 +01:00
Michael Telatynski
25a994e575 pull toLowerCase(...).replace(...) out of the loop 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-06 08:45:32 +01:00
Michael Telatynski
878f0a4753 Be somewhat fuzzier when matching emojis to complete on space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-06 08:39:24 +01:00
J. Ryan Stinnett
b5f85399a7 Rename may to might 2019-06-05 19:26:14 +01:00