mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 04:35:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
11233 commits 207 branches 547 tags 609 MiB
Commit graph

11233 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
3b0b836637 Change format of server usage limit message 
As per https://github.com/matrix-org/matrix-doc/issues/1452 /
https://github.com/matrix-org/synapse/pull/3680/
 2018-08-22 17:54:02 +01:00
David Baker
454d78254d
Merge pull request #2129 from matrix-org/revert-2126-bwindels/fixllpeek 
Revert "Fix showing peek preview while LL members are loading"
 2018-08-22 16:16:26 +01:00
David Baker
bf7633250a
Revert "Fix showing peek preview while LL members are loading" 2018-08-22 16:16:17 +01:00
Bruno Windels
6967bcb445
Merge pull request #2126 from matrix-org/bwindels/fixllpeek 
Fix showing peek preview while LL members are loading
 2018-08-22 16:11:12 +02:00
Bruno Windels
db7dd8e9e8 fix tests 2018-08-22 16:02:12 +02:00
Bruno Windels
a54629276f use getJoinedMemberCount() instead of getJoinedMembers().length as the latter doesnt take LL into account 2018-08-22 14:08:18 +02:00
Bruno Windels
860c6355f0 do self membership checks with getMyMembership elsewhere as well 2018-08-22 14:06:28 +02:00
Bruno Windels
c38b286e8e falsy check is obsolete now 2018-08-22 12:28:00 +02:00
Bruno Windels
01a0260ac8 use getMyMembership instead of member 2018-08-22 10:33:13 +02:00
David Baker
c00610cb2c Merge branch 'master' into develop 2018-08-20 13:57:00 +01:00
David Baker
aecddd58cc v0.13.1 2018-08-20 13:56:10 +01:00
David Baker
c43f0bc271 Prepare changelog for v0.13.1 2018-08-20 13:56:10 +01:00
David Baker
51d9c48230 Released js-sdk 2018-08-20 13:52:09 +01:00
Matthew Hodgson
c410a737d9 fix NPE: apparently otherMember can be undefined as well as null on LL 2018-08-17 12:23:58 +02:00
David Baker
94c7ae2bf5
Merge pull request #2098 from matrix-org/dbkr/destroy_widget 
Destroy non-persistent widgets when switching room
 2018-08-17 09:53:41 +01:00
David Baker
e3643bd74c Lint 2018-08-17 09:42:23 +01:00
Bruno Windels
cead4096d8
Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading 
Lazy loading of room members
 2018-08-16 18:14:55 +02:00
David Baker
0ab2589622 v0.13.1-rc.1 2018-08-16 15:26:32 +01:00
David Baker
802ab83c93 Prepare changelog for v0.13.1-rc.1 2018-08-16 15:26:32 +01:00
David Baker
48bbc200e3 js-sdk rc.1 2018-08-16 15:23:59 +01:00
David Baker
936fba655a
Merge pull request #2121 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-08-16 15:08:47 +01:00
Bruno Windels
cde5ef48ee
Merge pull request #2120 from matrix-org/dbkr/mau_to_limit_exceeded 
Shift to M_RESOURCE_LIMIT_EXCEEDED errors
 2018-08-16 15:33:44 +02:00
Andrey
35b6e2dc89 Translated using Weblate (Russian) 
Currently translated at 99.0% (1207 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-08-16 13:29:08 +00:00
csybr
4ab4d97c36 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2018-08-16 13:29:07 +00:00
Krombel
f63c5c9dea Translated using Weblate (German) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-08-16 13:29:07 +00:00
David Baker
98ae331bee Merge remote-tracking branch 'origin/develop' into dbkr/mau_to_limit_exceeded 2018-08-16 14:10:26 +01:00
fede
32a1d71f77 Translated using Weblate (Italian) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-08-16 13:09:55 +00:00
David Baker
8567ce585b Factor out duplication of resource limit i18n 2018-08-16 13:31:17 +01:00
David Baker
7d690d98e3 Rename variable as it's now not just MAU 2018-08-16 10:35:27 +01:00
Jeff Huang
e65f71f5fc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-08-15 18:32:18 +00:00
David Baker
9bde468e30 Shift to M_RESOURCE_LIMIT_EXCEEDED errors 
With support for admin_contact and limit_type fields

For https://github.com/vector-im/riot-web/issues/7091
 2018-08-15 17:03:54 +01:00
Krombel
2c75cd9ad9 Translated using Weblate (German) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-08-15 15:57:11 +00:00
csybr
c8a99ddec1 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2018-08-15 12:01:42 +00:00
Weblate
861a360ab2 Merge remote-tracking branch 'origin/develop' into develop 2018-08-15 11:56:19 +00:00
Bruno Windels
e534090da7
Merge pull request #2119 from matrix-org/bwindels/fixroomsettingstest 
Fix RoomSettings test
 2018-08-15 13:56:13 +02:00
Bruno Windels
1675d3c4ba room stub not having getVersion method broke tests 2018-08-15 13:22:26 +02:00
Osoitz
3091738f22 Translated using Weblate (Basque) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-08-15 10:12:50 +00:00
David Baker
86f60a803d
Merge pull request #2115 from matrix-org/bwindels/ll_toggle 
Lazy loading: feature toggle
 2018-08-15 10:46:18 +01:00
Kévin C
ad6544f043 Translated using Weblate (French) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-15 08:30:25 +00:00
Slavi Pantaleev
647ce511db Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-08-15 08:10:19 +00:00
Szimszon
2f3d0503af Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-08-15 07:56:25 +00:00
Weblate
f1f52329d9 Merge remote-tracking branch 'origin/develop' into develop 2018-08-15 06:55:44 +00:00
Kévin C
6cbafa3faa Translated using Weblate (French) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-15 06:55:44 +00:00
RainSlide
2c41a5e49a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (1215 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-08-15 06:55:43 +00:00
Bruno Windels
4c69c8d0f1
Merge pull request #2117 from matrix-org/dbkr/show_room_version 
Show room version number in room settings
 2018-08-15 08:55:38 +02:00
David Baker
c736ae7efb Copyright 2018-08-14 16:53:34 +01:00
random
db0acdad45 Translated using Weblate (Italian) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-08-14 14:05:43 +00:00
David Baker
f20920718a Show room version number in room settings 
Also change wording of the Room ID bit to match

Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-14 14:28:30 +01:00
David Baker
b71e5590f9
Merge pull request #2116 from matrix-org/bwindels/ll_cleanup 
Lazy loading: cleanup
 2018-08-14 14:02:15 +01:00
Bruno Windels
440ebd187d getMyMembership() doesn't take id anymore 2018-08-14 11:47:05 +02:00