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

16788 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
6881b47939 fix layout on password field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-06 23:51:04 +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
bd0e676b46 Switch ugly password boxes to Field or styled input 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-06 09:16:28 +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
Travis Ralston
c15ee1a829 Appease the linter 2019-06-05 12:15:37 -06:00
J. Ryan Stinnett
5581b56cfe Restrict reactions to a single emoji 
While the protocol supports more complex strings, in Riot we only want to
display single emoji.

Fixes https://github.com/vector-im/riot-web/issues/9916
 2019-06-05 18:35:43 +01:00
Travis Ralston
ace1bde238 Implement design and copy for errors 2019-06-05 11:32:02 -06:00
Weblate
e1cd4a78f1 Merge branch 'origin/develop' into Weblate. 2019-06-05 16:20:36 +00:00
Nathan Follens
4e2c2abc92 Translated using Weblate (West Flemish) 
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/vls/
 2019-06-05 16:20:36 +00:00
J. A. Durieux
cfe729b906 Translated using Weblate (Dutch) 
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/nl/
 2019-06-05 16:20:35 +00:00
J. Ryan Stinnett
97019fbfb5
Merge pull request #3068 from matrix-org/jryans/reaction-row-button-live 
Fix live updates to reaction row buttons
 2019-06-05 17:20:30 +01:00
J. Ryan Stinnett
c8cd1f30dd Fix live updates to reaction row buttons 
This makes the reaction row buttons take the current count as prop as an easy
way of ensuring they always trigger an update when the count changes.

Fixes https://github.com/vector-im/riot-web/issues/9954
 2019-06-05 14:54:26 +01:00
Weblate
0020ec8100 Merge branch 'origin/develop' into Weblate. 2019-06-05 13:25:13 +00:00
Travis Ralston
85858c731c
Merge pull request #3065 from matrix-org/travis/fix-logout 
Don't refresh custom status on logout
 2019-06-05 07:25:08 -06:00
Weblate
595d4b7b22 Merge branch 'origin/develop' into Weblate. 2019-06-05 13:23:50 +00:00
J. A. Durieux
8d9fe89fce Translated using Weblate (Dutch) 
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/nl/
 2019-06-05 13:23:50 +00:00
Travis Ralston
38a4031299
Merge pull request #3066 from matrix-org/travis/no-button-guest 
Add a logged in class to EmbeddedPage and react to MatrixClient changes
 2019-06-05 07:23:45 -06:00
Pierre Boyer
8158567640 Remove left/right autocomplete navigation for MessageEditor 2019-06-05 10:49:49 +02:00
Weblate
278bcd9a23 Merge branch 'origin/develop' into Weblate. 2019-06-05 07:50:00 +00:00
Nathan Follens
714d8da9f6 Translated using Weblate (West Flemish) 
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/vls/
 2019-06-05 07:50:00 +00:00
Edgars Voroboks
1f8364f2ec Translated using Weblate (Latvian) 
Currently translated at 56.8% (932 of 1641 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2019-06-05 07:49:56 +00:00
J. A. Durieux
0bc9c08c92 Translated using Weblate (Dutch) 
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/nl/
 2019-06-05 07:49:56 +00:00
Nathan Follens
a5cb9a85a7 Translated using Weblate (Dutch) 
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/nl/
 2019-06-05 07:49:56 +00:00
Mani Farone
9318c87de3 Translated using Weblate (Bulgarian) 
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/bg/
 2019-06-05 07:49:55 +00:00
Slavi Pantaleev
fe791f4a7d Translated using Weblate (Bulgarian) 
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/bg/
 2019-06-05 07:49:55 +00:00