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

21911 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tentarial
46fcb7d348 Translated using Weblate (German) 
Currently translated at 72.6% (1544 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 14:34:35 +00:00
Bruno Windels
9ab861121d
Merge pull request #4090 from matrix-org/bwindels/localaliasspinner 
show spinner while loading local aliases
 2020-02-19 14:34:27 +00:00
Bruno Windels
a5b9682572 show spinner while loading local aliases 2020-02-19 15:15:05 +01:00
Weblate
fb7cc02b62 Merge branch 'origin/develop' into Weblate. 2020-02-19 14:04:15 +00:00
Damir Jelić
7f71e551da EventIndex: Split out the statements that check for a valid event type. 2020-02-19 14:50:59 +01:00
Damir Jelić
156c6b8db8 EventIndex: Document the return value of the isValidEvent method. 2020-02-19 14:50:59 +01:00
Damir Jelić
59f8b4f6b1 EventIndex: Don't index key verification events. 
Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
 2020-02-19 14:50:59 +01:00
Weblate
2e1334238c Merge branch 'origin/develop' into Weblate. 2020-02-19 12:53:07 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent 
Get rid of dependence on usercontent.riot.im
 2020-02-19 12:53:01 +00:00
Michael Telatynski
4da5f32764 get rid of lockOrigin backwards compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 12:44:46 +00:00
Weblate
48787d5f4e Merge branch 'origin/develop' into Weblate. 2020-02-19 10:28:50 +00:00
Bruno Windels
5b8551df1f
Merge pull request #4089 from matrix-org/bwindels/fixnoaliasesforpublicroom 
also detect aliases using new /aliases endpoint for room access settings
 2020-02-19 10:28:45 +00:00
Bruno Windels
30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Weblate
a9fe810bab Merge branch 'origin/develop' into Weblate. 2020-02-19 10:03:00 +00:00
Walter
48ef8e84e6 Translated using Weblate (Russian) 
Currently translated at 80.9% (1719 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-19 10:03:00 +00:00
random
ad8255e31a Translated using Weblate (Italian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-19 10:02:59 +00:00
Szimszon
6c9d489ef7 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-19 10:02:58 +00:00
Tentarial
7460ddfada Translated using Weblate (German) 
Currently translated at 71.1% (1512 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 10:02:58 +00:00
Kévin C
2273b8606b Translated using Weblate (French) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-19 10:02:56 +00:00
Jeff Huang
d7a6296100 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-19 10:02:56 +00:00
Bruno Windels
6118e9621e
Merge pull request #4086 from matrix-org/bwindels/fixaliases 
get local aliases from /aliases in room settings
 2020-02-19 10:02:50 +00:00
Bruno Windels
cb5882d59b add null check 2020-02-19 10:40:00 +01:00
rtestard
650f412acb I have added a new line at the end of the scss file 2020-02-19 10:15:58 +01:00
Bruno Windels
4c9c57bfe5 check server feature flag 
if not available, revert to old behavior
 2020-02-19 10:06:52 +01:00
Bruno Windels
e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski
600cb64d00 don't nest <a> inside <AccessibleButton> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 15:04:57 +00:00
Weblate
246a903fe8 Merge branch 'origin/develop' into Weblate. 2020-02-18 13:54:03 +00:00
Miren
27bae86c0c Translated using Weblate (Basque) 
Currently translated at 97.6% (2074 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-18 13:54:03 +00:00
Besnik Bleta
01f8a1e01f Translated using Weblate (Albanian) 
Currently translated at 99.7% (2119 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-18 13:54:02 +00:00
Zoe
27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm 
Start verification sessions in an E2E DM where possible
 2020-02-18 13:53:56 +00:00
Zoe
0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Weblate
f8dc10f820 Merge branch 'origin/develop' into Weblate. 2020-02-18 10:16:07 +00:00
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods 
Only show supported verification methods
 2020-02-18 10:16:01 +00:00
Bruno Windels
46e63fd571 cancel on dialog close 2020-02-18 11:14:16 +01:00
Weblate
4520886cde Merge branch 'origin/develop' into Weblate. 2020-02-18 09:55:44 +00:00
catborise
025d028893 Translated using Weblate (Turkish) 
Currently translated at 71.7% (1521 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-18 09:55:44 +00:00
Walter
0c3d247948 Translated using Weblate (Russian) 
Currently translated at 80.8% (1714 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-18 09:55:41 +00:00
Tuomas Hietala
c97bcc39f9 Translated using Weblate (Finnish) 
Currently translated at 89.5% (1899 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-02-18 09:55:40 +00:00
Remi Reuvekamp
20a8fc1620 Translated using Weblate (Dutch) 
Currently translated at 85.2% (1808 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-18 09:55:38 +00:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2 
Use local echo in VerificationRequest for accepting/declining a verification request
 2020-02-18 09:55:27 +00:00
Zoe
23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00
Zoe
28df1e28cf Start verification sessions in an E2E DM where possible 
Fixes https://github.com/vector-im/riot-web/issues/12187
 2020-02-17 15:08:22 +00:00
Weblate
bb5ff2e4b4 Merge branch 'origin/develop' into Weblate. 2020-02-17 14:16:19 +00:00
David Baker
281cc223ed back to develop dep 2020-02-17 14:16:03 +00:00
Weblate
d63f1978a2 Merge branch 'origin/develop' into Weblate. 2020-02-17 13:37:07 +00:00
progserega
0325fdd37b Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
Walter
ed7702b01c Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
RiotRobot
fc6028ede2 Merge branch 'master' into develop 2020-02-17 13:36:53 +00:00
RiotRobot
f99d347b23 v2.1.0 2020-02-17 13:36:06 +00:00