Commit Graph

5510 Commits

Author SHA1 Message Date
Bruno Windels 1eabb6012a Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner
Show spinner in member list while loading members
2018-09-03 15:05:27 +02:00
Bruno Windels cae419e304 avoid rerendering when LL is disabled 2018-09-03 11:13:56 +02:00
David Baker 75a2668e42 Merge pull request #2141 from matrix-org/bwindels/fixdmavatar
Fix DM avatar
2018-08-30 11:45:54 +01:00
Bruno Windels d7868dbe33 delegate avatar selection to room for rooms with two members (but not in m.direct) 2018-08-30 10:54:01 +02:00
David Baker 2c1ba6f104 Merge pull request #2124 from matrix-org/dbkr/tombstone
Support m.room.tombstone events
2018-08-29 18:38:48 +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 bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +01:00
Bruno Windels f9c40390e9 set state after setting _showPresence to avoid all members to appear offline on matrix.org 2018-08-29 11:09:55 +02:00
Bruno Windels e9e5abfcc5 show a spinner in the memberlist while loading the members 2018-08-29 10:30:25 +02: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 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 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 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
David Baker f679acea08 Revert "Revert "Fix showing peek preview while LL members are loading"" 2018-08-22 16:35:58 +01:00
David Baker bf7633250a Revert "Fix showing peek preview while LL members are loading" 2018-08-22 16:16:17 +01: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 8d6d1be992 Typo 2018-08-21 16:40:04 +01:00
David Baker 7f8cd203a8 Support m.room.tombstone events
For https://github.com/vector-im/riot-web/issues/7164
2018-08-21 15:56:56 +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 9f19896df0 Support for room upgrades
* Show when a room upgrade is needed
 * Dialog box to perform the upgrade
2018-08-17 14:54:43 +01: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 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
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
David Baker c736ae7efb Copyright 2018-08-14 16:53:34 +01: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
Bruno Windels a86ca952b3 forgot to remove this 2018-08-14 09:38:43 +02:00
Bruno Windels 7dc92fe917 Avoid clearing e2e encryption keys, also avoid warning 2018-08-13 17:24:27 +02:00
Bruno Windels 84b74247e6 check if server supports lazy loading before enabling 2018-08-13 16:19:44 +02:00
David Baker f7f62ba09d Lint 2018-08-13 14:04:08 +01:00
David Baker d84ecbe97c s/m.server_notices/m.server_notice/ 2018-08-13 13:53:38 +01:00
David Baker 05bf200a72 Don't crash if scrollbars updated before init
The initialisation here is done on a timer to allow the DOM
elements to be in place before it's run, so it's possible for an
update to happen ebfore the initialisation. Stop & bail out if
there is no this.stickies.
2018-08-13 13:49:22 +01:00
Bruno Windels 28292c3388 implement PR feedback, move LL dialog to UserSettings 2018-08-13 11:14:30 +02:00