bd0a9cf3a0
Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade
2018-08-29 15:51:07 +01:00
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
06160f5fae
fix lint
2018-08-27 18:52:33 +02:00
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
36665d3c69
Fix: dont show 1:1 avatar for room with only 2 members loaded
2018-08-27 17:40:31 +02:00
c03abddd1c
s/terms and conditions/legal/
2018-08-24 11:38:38 +01:00
18ed6eb63c
Rener terms & conditions in settings
...
If configured in config file
2018-08-24 11:35:21 +01:00
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
06ffc70aa4
Merge pull request #2127 from matrix-org/dbkr/hide_replaced_rooms
...
Hide replaced rooms
2018-08-23 09:33:40 +01:00
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
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
37e60e4fc4
wait for members loading to finish to show the avatar in the composer
2018-08-23 00:02:20 +02:00
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
a5f98b6a29
Make the is-alone check use efficient methods
2018-08-22 17:05:36 +01:00
f679acea08
Revert "Revert "Fix showing peek preview while LL members are loading""
2018-08-22 16:35:58 +01:00
bf7633250a
Revert "Fix showing peek preview while LL members are loading"
2018-08-22 16:16:17 +01:00
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
a54629276f
use getJoinedMemberCount() instead of getJoinedMembers().length as the latter doesnt take LL into account
2018-08-22 14:08:18 +02:00
860c6355f0
do self membership checks with getMyMembership elsewhere as well
2018-08-22 14:06:28 +02:00
b7570002e0
Hide replaced rooms
...
By using new getVisibleRooms() in js-sdk
2018-08-22 12:01:29 +01:00
c38b286e8e
falsy check is obsolete now
2018-08-22 12:28:00 +02:00
01a0260ac8
use getMyMembership instead of member
2018-08-22 10:33:13 +02:00
8d6d1be992
Typo
2018-08-21 16:40:04 +01:00
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
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
e3643bd74c
Lint
2018-08-17 09:42:23 +01:00
cead4096d8
Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading
...
Lazy loading of room members
2018-08-16 18:14:55 +02:00
8567ce585b
Factor out duplication of resource limit i18n
2018-08-16 13:31:17 +01:00
7d690d98e3
Rename variable as it's now not just MAU
2018-08-16 10:35:27 +01:00
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
c736ae7efb
Copyright
2018-08-14 16:53:34 +01:00
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
a86ca952b3
forgot to remove this
2018-08-14 09:38:43 +02:00
7dc92fe917
Avoid clearing e2e encryption keys, also avoid warning
2018-08-13 17:24:27 +02:00
84b74247e6
check if server supports lazy loading before enabling
2018-08-13 16:19:44 +02:00
f7f62ba09d
Lint
2018-08-13 14:04:08 +01:00
d84ecbe97c
s/m.server_notices/m.server_notice/
2018-08-13 13:53:38 +01:00
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
28292c3388
implement PR feedback, move LL dialog to UserSettings
2018-08-13 11:14:30 +02:00
a02e1aa2b2
add action/method to flush storage and reload the session
2018-08-09 18:41:18 +02:00
308a6b419e
allow a setting controller to validate and revert a change (asynchronously)
2018-08-09 16:56:02 +02:00
16b7763c0e
s/limit/limit_type/
2018-08-07 17:22:12 +01:00
6593ee09d1
Warning bar for MAU limit hit
...
Somewhat untested, sorry
2018-08-07 17:04:37 +01:00
1009bc43ae
call method on room now to LL members
2018-08-07 14:47:06 +02:00
f44cc8e66e
Merge pull request #2112 from matrix-org/dbkr/recognise_server_notices_room
...
Recognise server notices room(s)
2018-08-07 09:52:25 +01:00
879cf24a50
Merge pull request #2111 from matrix-org/dbkr/room_tags_spec_update
...
Update room tags behaviour to match spec more
2018-08-07 09:52:01 +01:00
07083e61b7
Merge pull request #2058 from matrix-org/t3chguy/hide_logout_warning_whilst_logging_out
...
while logging out ignore `Session.logged_out` as it is intentional
2018-08-07 10:31:29 +02:00
b5ce1ac5e1
Recognise server notices room(s)
...
and put them in their own section at the bottom
2018-08-06 18:00:40 +01:00
b2302af708
Update room tags behaviour to match spec more
...
Fix Riot's behaviour with room tags after my cleanup in
https://github.com/matrix-org/matrix-doc/pull/1457 . Although, reading
it again, it's not clear how you're supposed to tell the difference
between a reverse-dns tag name and a legacy freeform text tag
(contains a '.'?) - I've left it detecting these as freeform text
for now.
2018-08-06 16:58:54 +01:00
ccdb5fa770
Don't show 'connection lost' bar on MAU error
...
We don't need both warning bars
Requires https://github.com/matrix-org/matrix-js-sdk/pull/680
2018-08-03 18:02:09 +01:00
David Baker