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
11273 commits 207 branches 547 tags 609 MiB
Commit graph

11273 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
7f2599c3ae
Merge pull request #2123 from matrix-org/dbkr/roomcreate 
Support room creation events
 2018-08-29 18:38:20 +01:00
David Baker
6cbe4144d4 unused import 2018-08-29 18:28:16 +01:00
David Baker
c40ac49b2a Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate 2018-08-29 18:18:08 +01:00
David Baker
499d14cf27
Merge pull request #2122 from matrix-org/dbkr/room_upgrade 
Support for room upgrades
 2018-08-29 17:20:00 +01:00
David Baker
bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +01:00
Bruno Windels
cc0375fa66
Merge pull request #2137 from matrix-org/bwindels/fixllroomavatar 
Fix: dont show 1:1 avatar for rooms +2 members but only <=2 members loaded
 2018-08-28 15:35:19 +02:00
Bruno Windels
06160f5fae fix lint 2018-08-27 18:52:33 +02:00
Bruno Windels
6a077655e9 bring back old behaviour to also show member avatars if not marked as 1:1 room 2018-08-27 18:48:21 +02:00
Bruno Windels
36665d3c69 Fix: dont show 1:1 avatar for room with only 2 members loaded 2018-08-27 17:40:31 +02:00
David Baker
30114e3b5b
Merge pull request #2136 from matrix-org/dbkr/tnclinks 
Render terms & conditions in settings
 2018-08-24 14:44:30 +01:00
David Baker
c03abddd1c s/terms and conditions/legal/ 2018-08-24 11:38:38 +01:00
David Baker
18ed6eb63c Rener terms & conditions in settings 
If configured in config file
 2018-08-24 11:35:21 +01:00
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
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
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
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
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
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
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
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
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
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
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
David Baker
cd4b520574 Add image dimensions 
To avoid popping when the image loads & make sure the SVG appears
the right size
 2018-08-21 17:52:13 +01:00
David Baker
c4235ca20a Add the image 2018-08-21 17:50:59 +01:00
David Baker
8d6d1be992 Typo 2018-08-21 16:40:04 +01:00
David Baker
ab10b5493b Support room creation events 
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-20 16:20:59 +01: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