David Baker
fa30707eae
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-02 16:59:15 +01:00
David Baker
3751074244
Merge pull request #2180 from matrix-org/travis/3pid-required
...
Communicate early that a 3pid is required during registration if needed
2018-10-01 11:55:53 +01:00
Matthew Hodgson
6652d2b0e6
try to encourage people to attach logs to bugs
2018-09-28 21:05:05 +01:00
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
f4860cfe63
update copyright notice
2018-09-26 18:22:05 +01:00
Bruno Windels
fd2ab406d4
update copy
2018-09-26 16:48:04 +01:00
Bruno Windels
824ad5e318
delete sync data when LL is toggled, show message when enabling
2018-09-26 16:25:21 +01:00
Matthew Hodgson
0f806d5b99
Merge branch 'develop' into matthew/canonical_aliases
2018-09-20 01:45:08 +01:00
Matthew Hodgson
e9806bb147
autocomplete domains on aliases
2018-09-20 01:38:25 +01:00
Matthew Hodgson
1aa85c69e4
fix vector-im/riot-web#7293
2018-09-20 01:23:29 +01:00
Matthew Hodgson
c6fa8ea24c
show canonical aliases in timeline, and set/remove implicit ones
2018-09-20 01:07:01 +01:00
Bruno Windels
920e0d397c
Merge branch 'develop' into bwindels/fixstalerr
2018-09-19 12:15:41 +02:00
David Baker
2cef0f7f72
lint
2018-09-18 15:04:51 +01:00
Matthew Hodgson
d39889e2cf
Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases
...
Add m.room.aliases to the timeline
2018-09-18 11:14:44 +01:00
Matthew Hodgson
ece041d059
fix NPE on name (related to LL?)
2018-09-18 00:16:25 +01:00
Bruno Windels
8c4f4765df
remove initial parameter and show available members on invite instead
2018-09-17 20:03:01 +02:00
Bruno Windels
0727e0f8d3
mounted can be set straight in componentWillMount
2018-09-17 20:02:15 +02:00
Bruno Windels
e8b4770940
fix lint
2018-09-17 20:01:55 +02:00
Matthew Hodgson
0e1a814d23
remove RoomAliasesEvent in favour of simpler textual event
2018-09-17 18:27:17 +01:00
Bruno Windels
e0a789f77e
remove untrue comment, as we only load the members when joining
2018-09-17 19:21:22 +02:00
Bruno Windels
e1b9aa9626
better naming and document method
2018-09-17 19:20:26 +02:00
Matthew Hodgson
dc7212ec2b
switch back to simple TextForEvent
...
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
2018-09-17 18:20:12 +01:00
Bruno Windels
d276b17c2a
remove dead code
2018-09-17 19:19:07 +02:00
Bruno Windels
c3914d3493
show empty list as initial state instead of spinner
...
the spinner should only be shown when joined
2018-09-17 19:18:55 +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
David Baker
12d10cccef
Show if sig is from this device
2018-09-17 17:14:03 +01:00
David Baker
f507aac3d5
Show if recovery key is valid
2018-09-17 17:05:29 +01:00
David Baker
9a65e6817a
Support restoring key backup
2018-09-17 16:00:23 +01:00
Matthew Hodgson
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
David Baker
2e6d27717c
LIIIIIIIIIIIIIIIINT!
2018-09-14 17:33:25 +01:00
David Baker
d94553bafc
UI for whether the key backup is enabled or not
2018-09-14 17:08:02 +01:00
Bruno Windels
27c496aecb
remove unneeded async keywords
2018-09-14 13:55:47 +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
David Baker
292b1f09af
WIP e2e key backups
...
Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.
Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
2018-09-13 17:11:46 +01:00
David Baker
59e4879b14
Merge remote-tracking branch 'origin/develop' into matthew/e2e_backups
2018-09-11 13:03:22 +01:00
David Baker
518be24a5b
Merge pull request #2164 from matrix-org/dbkr/dont_exit_fullscreen_when_not
...
Don't try to exit fullscreen if not fullscreen
2018-09-11 13:03:09 +01:00
David Baker
f62e92a07b
Merge remote-tracking branch 'origin/develop' into matthew/e2e_backups
2018-09-11 11:37:22 +01:00
David Baker
d3038ea765
Don't try to exit fullscreen if not fullscreen
...
This was causing annoying exceptions on latest Chrome. Use
document.fullScreenElement to detect if we're fullscreen and don't
try to exit if we aren't.
2018-09-11 11:31:24 +01:00
Bruno Windels
ecaabd6b75
Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading
...
avoid updating the memberlist while the spinner is shown
2018-09-11 10:57:29 +02:00
Bruno Windels
2aaf3e6b89
dont assign member in getInitialState
2018-09-10 17:39:03 +02:00
Bruno Windels
92f7e29132
missed one {} -> [], fix e2e tests
2018-09-10 17:32:40 +02:00
Bruno Windels
5044d4f2d6
dont keep the spinner in the memberlist when fetching /members fails
2018-09-10 14:56:10 +02:00
Bruno Windels
0cd222ef0b
make users available in member by requesting them from client right before
...
before this was already foreseen, but memberDict wasn't being refreshed
as it's only used in roomMembers(), I got rid of memberDict as well
2018-09-07 23:44:20 +02:00
Bruno Windels
7fe822ca17
Merge branch 'develop' into bwindels/dontupdatememberlistwhileloading
2018-09-07 23:43:25 +02:00
Bruno Windels
467cdd2f1f
Merge branch 'develop' into bwindels/optimizememberlist
2018-09-07 18:32:13 +02:00
Bruno Windels
9cc9fbf924
avoid memberlist refresh for events related to rooms other but the current
2018-09-07 14:05:26 +02:00
Bruno Windels
fec7d2ee5f
avoid updating the memberlist while the spinner is shown
...
the memberlist gets updated constantly while the LL members
are being added to the room state. this slows things down unneed, and is one of the
main cause of dropping frames when member arrive.
2018-09-07 12:00:19 +02:00
David Baker
c8ab8bf5f8
Merge pull request #2150 from matrix-org/dbkr/disable_ilag_if_unsupported
...
Do full registration if HS doesn't support ILAG
2018-09-06 16:23:32 +01:00
Bruno Windels
26df485607
Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission
2018-09-06 15:35:41 +02:00
David Baker
4c8d2de563
Revert "Revert "Don't rely on room members to query power levels""
2018-09-06 11:48:23 +01:00
