sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
11,356 Commits 4 Branches 19 Tags
40e5d379f0e3dc2268ba62ff1be8398b09db351a
Commit Graph
2364 Commits
Author SHA1 Message Date
David Baker bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +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 BakerandGitHub 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 BakerandGitHub 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
David BakerandGitHub f679acea08 Revert "Revert "Fix showing peek preview while LL members are loading"" 2018-08-22 16:35:58 +01:00
David BakerandGitHub 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 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 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
Bruno WindelsandGitHub 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
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 d84ecbe97c s/m.server_notices/m.server_notice/ 2018-08-13 13:53:38 +01:00
Bruno Windels 28292c3388 implement PR feedback, move LL dialog to UserSettings 2018-08-13 11:14:30 +02:00
Bruno Windels a02e1aa2b2 add action/method to flush storage and reload the session 2018-08-09 18:41:18 +02:00
Bruno Windels 308a6b419e allow a setting controller to validate and revert a change (asynchronously) 2018-08-09 16:56:02 +02:00
David Baker 16b7763c0e s/limit/limit_type/ 2018-08-07 17:22:12 +01:00
David Baker 6593ee09d1 Warning bar for MAU limit hit 
Somewhat untested, sorry
 2018-08-07 17:04:37 +01:00
Bruno Windels 1009bc43ae call method on room now to LL members 2018-08-07 14:47:06 +02:00
Bruno WindelsandGitHub 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
David Baker 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 b5d2fa769c Support MAU error on sync 
For https://github.com/vector-im/riot-web/issues/7091
 2018-08-03 14:54:52 +01:00
David BakerandGitHub bc1d359398 Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_message_send 
Support active user limit on message send
 2018-08-03 13:14:18 +01:00
David Baker 02019a58b3 Support active user limit on message send 
For https://github.com/vector-im/riot-web/issues/7091
 2018-08-02 17:09:04 +01:00
David Baker bb9a3eb33d Support MAU limit error on register too 2018-08-02 16:09:57 +01:00
David Baker cc58b06226 Support montly active user limit error on /login 
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
 2018-08-02 14:25:17 +01:00
Bruno Windels b151956f7b Use room method to help with DM detection with fallback to summary heroes/counts. 2018-08-02 11:42:19 +02:00
Bruno Windels 908de56c6d replace getMember(myId).membership with getMyMembership 
This works with rooms which haven't had their members
loaded yet.
 2018-08-02 11:42:05 +02:00
David Baker f4c073ad45 Nest ifs to avoid unnecessary work 2018-07-27 18:58:11 +01:00
David Baker e059a08d7b Make clicking on side panels close settings (mk 3) 
Just do it by fixing the somewhat hacky logic to not break if the
target elements also have additional classes, like they do if the
toolbar is showing (I think it turns out this bug is only that it
doesn't work with the toolbar showing...)

Fixes https://github.com/vector-im/riot-web/issues/5658
 2018-07-27 18:53:36 +01:00
Bruno Windels 33f5560666 move error message to caller of lazy loading 2018-07-25 16:10:49 +02:00
Bruno Windels 201332d96c move comment after rebase 2018-07-25 16:10:49 +02:00
Bruno Windels af07d73432 hide lazy loading behind feature flag 2018-07-25 16:10:49 +02:00
Bruno Windels e237a02fa5 use more consistent naming 2018-07-25 16:10:49 +02:00
Bruno Windels 6ff92ede8f this code actually never fires, so remove it 
and that's ok because createRoom will already mark a DM as such
on the inviter's side. So here we just handle the invitees side.
 2018-07-25 16:10:49 +02:00
Bruno Windels 19387805ac Don't assume RoomMember has a state event in direct chat detection 
Instead call the method on the member that takes lazy loading into account
 2018-07-25 16:10:49 +02:00
Bruno Windels de3e143a8f only lazy load the members when viewing a joined room 2018-07-25 16:10:49 +02:00
David Baker 7aab6fa6f1 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-18 09:35:57 +01:00
David Baker 4c6419a3c5 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-16 13:24:13 +01:00
Michael Telatynski ffe0b35504 while logging out ignore Session.logged_out as it is intentional 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 22:33:00 +01:00
Bruno Windels b412b9e84d Fix stopPeeking not being called at the right time 
stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.

The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.

This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
 2018-07-12 15:19:25 +02:00