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

11511 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
8313dcd0dd Merge branch 'master' into develop 2018-08-23 15:26:25 +01:00
David Baker
04d1ba2637 v0.13.2 2018-08-23 15:25:33 +01:00
David Baker
3192ecca7a Prepare changelog for v0.13.2 2018-08-23 15:25:32 +01:00
David Baker
504005512e
Merge pull request #2135 from matrix-org/dbkr/dont_crash_if_room_tag_value_null_2 
Don't crash if the value of a room tag is null
 2018-08-23 15:06:08 +01:00
David Baker
e3afbb157d Don't crash if the value of a room tag is null 
We were checking that the order was not null, but not the object
itself.
 2018-08-23 14:55:56 +01:00
Jeff Huang
58701d26ae Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-08-23 13:18:23 +00:00
Weblate
31a812724c Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 13:05:49 +00:00
David Baker
ee4df85937
Merge pull request #2133 from matrix-org/dbkr/dont_crash_if_room_tag_value_null 
Don't crash if the value of a room tag is null
 2018-08-23 14:05:44 +01:00
David Baker
cc08179b5d Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_room_tag_value_null 2018-08-23 13:54:24 +01:00
Weblate
7f4227a76e Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 12:53:31 +00:00
David Baker
7190fa301d
Merge pull request #2134 from matrix-org/dbkr/stub_getvisiblerooms 
Add stub for getVisibleRooms()
 2018-08-23 13:53:27 +01:00
Peter Vágner
1488417c3e Translated using Weblate (Slovak) 
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-08-23 12:11:55 +00:00
Weblate
d84a197d5d Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 11:41:23 +00:00
David Baker
98dabe1a46
Merge pull request #2132 from matrix-org/bwindels/fixllcomposeravatar 
Fix LL crash trying to render own avatar in composer when member isn't available yet
 2018-08-23 12:41:18 +01:00
David Baker
cb84feefa9 Add stub for getVisibleRooms() 
Fixes the tests
 2018-08-23 12:14:52 +01:00
David Baker
54620591cc Don't crash if the value of a room tag is null 
We were checking that the order was not null, but not the object
itself.
 2018-08-23 12:05:09 +01:00
Kévin C
f1e1553ef5 Translated using Weblate (French) 
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-23 09:02:54 +00:00
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
Bruno Windels
37e60e4fc4 wait for members loading to finish to show the avatar in the composer 2018-08-23 00:02:20 +02: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