Commit graph

11280 commits

Author SHA1 Message Date
Weblate
24ecba084b Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 08:36:54 +00:00
David Baker
2816175393
Merge pull request #2125 from matrix-org/dbkr/room_too_old_error
Support M_INCOMPATIBLE_ROOM_VERSION
2018-08-23 09:36:50 +01:00
Weblate
263c6dda7a Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 08:33:44 +00:00
David Baker
06ffc70aa4
Merge pull request #2127 from matrix-org/dbkr/hide_replaced_rooms
Hide replaced rooms
2018-08-23 09:33:40 +01:00
Weblate
c6cb4f9b87 Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 08:33:23 +00:00
David Baker
269670ed20
Merge pull request #2128 from matrix-org/dbkr/move_tiffany_check
Fix CPU spin on joining large room
2018-08-23 09:33:17 +01:00
Weblate
ea4c4455c0 Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 08:33:02 +00:00
csybr
f2821d6e76 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 98.7% (1220 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-23 08:33:01 +00:00
Slavi Pantaleev
99b020b4b0 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1236 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-23 08:33:01 +00:00
David Baker
b34aad50bc
Merge pull request #2131 from matrix-org/dbkr/change_mau_server_notice_format
Change format of server usage limit message
2018-08-23 09:32:56 +01:00
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
a5f98b6a29 Make the is-alone check use efficient methods 2018-08-22 17:05:36 +01:00
Weblate
1dac523217 Merge remote-tracking branch 'origin/develop' into develop 2018-08-22 15:46:11 +00:00
Bruno Windels
4fa8f92093
Merge pull request #2130 from matrix-org/revert-2129-revert-2126-bwindels/fixllpeek
Re-apply "Fix showing peek preview while LL members are loading""
2018-08-22 17:46:01 +02:00
David Baker
f679acea08
Revert "Revert "Fix showing peek preview while LL members are loading"" 2018-08-22 16:35:58 +01:00
Weblate
d45397d2e7 Merge remote-tracking branch 'origin/develop' into develop 2018-08-22 15:16:31 +00:00
Slavi Pantaleev
2ba69b61d8 Translated using Weblate (Bulgarian)
Currently translated at 98.3% (1216 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-22 15:16:30 +00: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
Weblate
02c630da5d Merge remote-tracking branch 'origin/develop' into develop 2018-08-22 14:11:20 +00:00
vejetaryenvampir
e70eee9641 Translated using Weblate (Turkish)
Currently translated at 60.1% (744 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2018-08-22 14:11:20 +00:00
Moo
8eaead9c18 Translated using Weblate (Russian)
Currently translated at 98.8% (1222 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-08-22 14:11:20 +00:00
csybr
9a2ecf9e00 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 98.7% (1220 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-22 14:11:20 +00:00
Moo
4a8fcd3429 Translated using Weblate (Lithuanian)
Currently translated at 54.2% (671 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-08-22 14:11:19 +00:00
random
6201d4e9bb Translated using Weblate (Italian)
Currently translated at 99.8% (1234 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-08-22 14:11:19 +00: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
David Baker
852d6a3be5 Fix CPU spin on joining large room
checkIfAlone() filters the whole member list, which is fine until
we do it once for every membership event, then we have an n^2
problem. Move it into the rate limited function.

Fixes https://github.com/vector-im/riot-web/issues/7163
2018-08-22 14:34:02 +01: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
David Baker
b7570002e0 Hide replaced rooms
By using new getVisibleRooms() in js-sdk
2018-08-22 12:01:29 +01: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
941a3cfa53 Support M_INCOMPATIBLE_ROOM_VERSION
For https://github.com/vector-im/riot-web/issues/7164
2018-08-21 18:33:25 +01:00
Miguel L
50f398ff4a Translated using Weblate (Spanish)
Currently translated at 100.0% (1236 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-08-20 13:08:38 +00:00
Weblate
80aad75584 Merge remote-tracking branch 'origin/develop' into develop 2018-08-20 12:57:15 +00:00
Miguel L
12e71aa850 Translated using Weblate (Spanish)
Currently translated at 98.8% (1222 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-08-20 12:57:15 +00:00
Andrey
7a125c3ad4 Translated using Weblate (Russian)
Currently translated at 98.8% (1222 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-08-20 12:57:15 +00:00
csybr
7ec2b2d44c Translated using Weblate (Norwegian Nynorsk)
Currently translated at 98.5% (1218 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-20 12:57:14 +00:00
Moo
dbe129cfef Translated using Weblate (Lithuanian)
Currently translated at 50.8% (629 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-08-20 12:57:14 +00:00
cocker-cc
aa94168242 Translated using Weblate (German)
Currently translated at 100.0% (1236 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-20 12:57:14 +00: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
František Šindelář
a2db7dead1 Translated using Weblate (Czech)
Currently translated at 100.0% (1236 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2018-08-18 21:57:13 +00:00
Jeff Huang
3ca56982e4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1236 of 1236 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-08-18 13:58:17 +00:00
Weblate
1aef02587a Merge remote-tracking branch 'origin/develop' into develop 2018-08-17 10:24:09 +00: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
Weblate
32294165f0 Merge remote-tracking branch 'origin/develop' into develop 2018-08-17 08:53:46 +00:00