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

16065 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Bruno Windels
940b2a7ef2
Merge pull request #3058 from matrix-org/bwindels/redactions-local-echo 
Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now.
 2019-06-05 07:49:51 +00:00
Mani Farone
a206871baa 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 06:19:43 +00:00
Slavi Pantaleev
f72f0bd478 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 06:19:43 +00:00
Travis Ralston
10f4d6b419 Appease the linter 2019-06-04 23:52:40 -06:00
Travis Ralston
e2fdeec71a Fail more softly on homeserver liveliness errors 
This performs liveliness checks on the auth pages to try and show a friendlier error. Earlier checks in the app startup are expected to not block the app from loading on such failures.

See https://github.com/vector-im/riot-web/issues/9828
 2019-06-04 23:42:38 -06:00
Travis Ralston
4fc054e1c9 Add a logged in class to EmbeddedPage and react to MatrixClient changes 
See https://github.com/vector-im/riot-web/pull/9957

The two hacks introduced here are for different reasons, mostly related to the welcome page. If you land directly on the welcome page, the app's lifecycle is highly unlikely to have a bootstrapped client. This results in the loggedIn class being false. When the client is later set up (loaded from session, new guest account registered, etc) the context fails to update for the EmbeddedPage, and we need to give it a kick to re-render. It's arguable if we should even keep using the context here.
 2019-06-04 16:08:32 -06:00
Travis Ralston
6b2dbdf7ba Don't refresh custom status on logout 
The RoomTile gets remounted during logout due to the room stores being obliterated, however this causes the render() function to check if it should be showing custom status. If you have custom status enabled, and the person has a status set, the function errors due to no MatrixClient being available.

Fixes https://github.com/vector-im/riot-web/issues/9940
 2019-06-04 15:34:11 -06:00
Bruno Windels
ef7b7628ac use Room.redactionCancelled event 2019-06-04 21:37:57 +02:00
David Baker
b412103f21
Merge pull request #3062 from matrix-org/dbkr/dont_break_on_wrong_password 
Fix login page breaking on wrong password
 2019-06-04 18:02:22 +01:00
J. Ryan Stinnett
bf52bfae15
Merge pull request #3064 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-06-04 17:30:33 +01:00
Nathan Follens
ace94843ef Translated using Weblate (West Flemish) 
Currently translated at 99.6% (1634 of 1641 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-06-04 16:20:10 +00:00
Nathan Follens
5b5c0222e6 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-04 16:20:09 +00:00
Weblate
104d3a8b05 Merge branch 'origin/develop' into Weblate. 2019-06-04 15:54:08 +00:00
J. Ryan Stinnett
ba5fd8a49d
Merge pull request #3063 from matrix-org/jryans/js-sdk-for-lint 
Install latest JS SDK when linting
 2019-06-04 16:54:03 +01:00
J. Ryan Stinnett
ba37a55a6c Install latest JS SDK when linting 
Since React SDK's linting rules depend on JS SDK, we should use the latest
changes when linting as well in case there's been a recent rule change.
 2019-06-04 16:40:45 +01:00
Weblate
29935f1dfa Merge branch 'origin/develop' into Weblate. 2019-06-04 15:24:15 +00:00
Nathan Follens
2c11ca20ab Translated using Weblate (West Flemish) 
Currently translated at 99.6% (1634 of 1641 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-06-04 15:24:15 +00:00