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

2445 commits

Author SHA1 Message Date
Travis Ralston
de132a8f8e Communicate early that a 3pid is required during registration if needed 
Fixes https://github.com/vector-im/riot-web/issues/7297
 2018-09-27 11:53:45 -06:00
Bruno Windels
928b6d47c8 add resize handles between 3 main app columns 2018-09-24 16:07:42 +01:00
Bruno Windels
91ec96c8d3 Merge branch 'develop' into bwindels/redesign 2018-09-21 12:44:44 +02:00
Bruno Windels
e8b4770940 fix lint 2018-09-17 20:01:55 +02:00
Bruno Windels
841aa4b800 check LL with client as this takes server support into account 2018-09-17 19:28:06 +02:00
Bruno Windels
0ce7bb8995 pass membersLoaded state to TimelinePanel to force it to re-render 
... once the members are loaded.
 2018-09-17 19:27:25 +02:00
Bruno Windels
473f2dd72b pass room to _loadMembersIfJoined, it's called when newState not applied 
_loadMembersIfJoined is called from
_onRoomLoaded < _onRoomViewStoreUpdate, before incoming state
from the store is applied to this.state, so looking up the room
with this.state.roomId doesn't always work, which would cause
the members not to be loaded. Pass in the room instead.
 2018-09-17 19:24:34 +02:00
Bruno Windels
2ed414494f use Room.myMembership event instead of RoomMember.membership for me 
This is more reliable with LL enabled as the syncing user is
only known when it was active in the current timeline
or when the members have been loaded
 2018-09-17 19:14:52 +02:00
Bruno Windels
86cbe34181 rerender after members are loaded so pills and RR get rerendered 2018-09-14 18:35:16 +02:00
Bruno Windels
f194f323f4 postpone loading the members until the user joined the room 
when peeking, the members weren't being loaded at all because
the room wasn't available yet,
and the need for loading the members was never re-evaluated after that.

This only loads the members once the user has joined the room,
which also helps to avoid load all the members before an invite
is accepted.
 2018-09-13 18:43:24 +02:00
Bruno Windels
deaad4bcb1 even better as the method called is on room 2018-09-10 18:11:08 +02:00
Bruno Windels
694ee5a2c8 fix logging room id when LL members fail 2018-09-10 18:09:11 +02:00
David Baker
877e949d1c
Merge pull request #2156 from matrix-org/bwindels/dontrefreshmembersforotherrooms 
avoid memberlist refresh for events related to rooms other but the current
 2018-09-07 13:57:29 +01:00
Bruno Windels
101dad83aa same for right panel 2018-09-07 14:16:26 +02:00
David Baker
fa669bf096 Error on splash screen if sync is failing 
Display an error on the splash screen with the spinner if the sync
request is not working, rather than just sitting there with a spinner
as if nothing is wrong.

Fixes https://github.com/vector-im/riot-web/issues/7148
 2018-09-07 12:18:25 +01:00
David Baker
27fa21e403 Replace view_set_mxid with require_registration 
To put all the other flows through the to-ilag-or-not-to-ilag flow
 2018-09-05 18:08:49 +01:00
David Baker
a042f4d0af Do full registration if HS doesn't support ILAG 
ILAG only works on HSes that allow registering without an email
address, so whenever we redirect to the ILAG flow, check what
registration flows the server supports, and if it doesn't offer one
that's ILAG-compatible, prompt the user to go through the full
registration process instead.

This doesn't change all the entry points into ILAG, I'll do that
in a separate commit.
 2018-09-05 17:07:39 +01:00
David Baker
4517eaba6f
Merge pull request #2148 from matrix-org/dbkr/dont_say_email_optional_if_it_isnt 
Correctly mark email as optional
 2018-09-05 11:31:19 +01:00
David Baker
e5b761b754
Merge pull request #2059 from matrix-org/t3chguy/join_community_fire_ilag_flow 
guests trying to join communities should fire the ILAG flow.
 2018-09-05 08:15:24 +01:00
David Baker
775d995052 Lint 2018-09-04 18:51:24 +01:00
David Baker
dc14a42148 Correctly mark email as optional 
Look at the flows to see if there is one we can complete without
an email address. Mark the email address as optional iff there is.
 2018-09-04 18:26:09 +01:00
Bruno Windels
bc97a3efb5
Merge pull request #2143 from matrix-org/bwindels/fixreconnectspinner 
Fix: show spinner again while recovering from connection error
 2018-09-04 16:40:30 +02:00
Bruno Windels
5c395e4db7 wait for room creation, to go to home page in case of failure 2018-09-04 14:26:36 +02:00
Bruno Windels
debcc20604 also show spinner on new CATCHUP state 2018-08-30 15:39:48 +02:00
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 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
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
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 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
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 Windels
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
Matthew Hodgson
4fbf34e05b Merge branch 'develop' into matthew/dharma 2018-08-03 17:15:00 -07: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 Baker
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
Matthew Hodgson
fe73953d9d fix merge; disable sticky headers; tweak chevrons 2018-07-30 09:00:11 -07:00
Matthew Hodgson
9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01: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
Michael Telatynski
923de17b91
allow passing initial is_url like hs_url in query params 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 16:10:46 +01: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
29d48e5dad
guests trying to join communities should fire the ILAG flow. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 22:48:25 +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
Matthew Hodgson
ffec1b5a95 fix lint 2018-07-09 20:11:17 +01:00
Luke Barnard
5af8ddcf10 Fix import 2018-07-06 11:00:39 +01:00
David Baker
b6f854abe4 Simplify event name as it's the only one 2018-07-05 20:00:42 +01:00
David Baker
eb552e5cef Just pass the roomId into WidgetEchoStore 2018-07-05 18:43:20 +01:00
Luke Barnard
d53c836fd7 Implement aggregation by error type for tracked decryption failures 2018-07-05 13:54:44 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
David Baker
8b64ddcbe8 Do some level of local echo for widgets 
* Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
 2018-07-03 11:16:44 +01:00
Luke Barnard
0dd3a77432 Track an event name when tracking a decryption failure 
Otherwise piwik will not agregate the failures correctly for all views.
 2018-07-02 09:45:32 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:28 +01:00
Michael Telatynski
ca83f1e8c8
allow RoomSubList to use old behaviour of not hiding even if empty 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:06:33 +01:00
David Baker
80a9bc3f2a
Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout 
Fix layout bug introduced by #2025
 2018-06-29 10:49:15 +01:00
Luke Barnard
ad5f1bf180 Fix layout bug introduced by #2025 
Fixes https://github.com/vector-im/riot-web/issues/6958

(https://github.com/matrix-org/matrix-react-sdk/pull/2025)
 2018-06-29 09:46:01 +01:00
Luke Barnard
01dd387970 Track UISIs in bulk 
Piwik supports sending an event value, which we can use to indicate
cardinality of UISIs to be tracked instead of tracking them individually.

This means we can track them at a lower frequency of (fairly arbitrary)
60s.
 2018-06-28 15:07:27 +01:00
Luke Barnard
66002a4c00 Fix status bar element positioning 2018-06-27 15:19:27 +01:00
Luke Barnard
8be173cae3 Show nicer error when receiving a consent error after sending a message 2018-06-27 15:17:57 +01:00
David Baker
6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click 
on room sub list badge click goto first relevant room
 2018-06-27 10:29:22 +01:00
Michael Telatynski
613e83edb4
on roomsublist invite badge click goto first room/group 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-27 09:49:58 +01:00
Michael Telatynski
b3341e6664
on click roomsublist notif badge, goto first room with notif 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-27 09:49:25 +01:00
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist 
fix historical section
 2018-06-26 18:26:29 +01:00
David Baker
9539a749e5 More refactoring 2018-06-26 16:03:58 +01:00
Michael Telatynski
abd37d141e
clear up if statement to make it more readable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:54:38 +01:00