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
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
Matthew Hodgson
fc81dbbfad
remove i18n used by RoomAliasesEvent
2018-09-17 22:40:00 +01:00
Matthew Hodgson
0e1a814d23
remove RoomAliasesEvent in favour of simpler textual event
2018-09-17 18:27:17 +01: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
David Baker
f65126119f
Merge pull request #2165 from matrix-org/bwindels/fixllpeeking
...
postpone loading the members until the user joined the room
2018-09-17 10:21:57 +01:00
Matthew Hodgson
003083d9fc
fix plurals
2018-09-16 20:19:02 +01:00
Matthew Hodgson
a4b7348703
fix merge on i18n again
2018-09-16 19:11:11 +01:00
Matthew Hodgson
599697ca2f
fix merge on i18n
2018-09-16 19:08:31 +01:00
Matthew Hodgson
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
David Baker
77d5daf9e3
Merge pull request #2166 from matrix-org/dbkr/allow_non_literal_translations
...
Allow translation tags object to be a variable
2018-09-14 15:42:54 +01:00
David Baker
e1394d592a
Allow translation tags object to be a variable
...
Don't try to validate the translation tags if it's not an object literal.
2018-09-14 14:11:59 +01:00
Bruno Windels
27c496aecb
remove unneeded async keywords
2018-09-14 13:55:47 +02:00
Bruno Windels
fe734b944e
remove obsolete warning as peeking will cause the membership to be null
2018-09-13 18:45:38 +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
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
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
David Baker
666c9a68e3
Merge pull request #2163 from matrix-org/bwindels/logllfailroomidcorrectly
...
fix logging room id when LL members fail
2018-09-11 09:54:29 +01: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
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
f0e33dff24
Merge pull request #2162 from matrix-org/bwindels/dontspinaftermemberserror
...
dont keep the spinner in the memberlist when fetching /members fails
2018-09-10 17:31:31 +02:00
Bruno Windels
ab931e0f62
Merge pull request #2160 from matrix-org/bwindels/selfmembershipaction
...
only dispatch an action for self-membership
2018-09-10 17:30:41 +02:00
Bruno Windels
dcc8a45aa1
add final return for clarity
2018-09-10 16:55:24 +02:00
Bruno Windels
5044d4f2d6
dont keep the spinner in the memberlist when fetching /members fails
2018-09-10 14:56:10 +02:00
David Baker
832a73d47a
Merge branch 'master' into develop
2018-09-10 11:40:58 +01:00
David Baker
60e55594dd
Merge branch 'release-v0.13.4'
2018-09-10 11:39:50 +01:00
David Baker
405f0bcf98
v0.13.4
2018-09-10 11:38:53 +01:00
David Baker
bb37e36e71
Prepare changelog for v0.13.4
2018-09-10 11:38:52 +01:00
David Baker
f99aef8ede
js-sdk v0.11.0
2018-09-10 11:36:06 +01:00
Matthew Hodgson
ef20813f2e
remove layering warnings
2018-09-09 18:38:21 +01:00
Matthew Hodgson
86c92ee56d
downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
2018-09-09 10:49:02 +01:00
Matthew Hodgson
b8bfed1308
point deps at #develop to unbreak npm i
2018-09-09 10:26:16 +01: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
9a3717a274
only dispatch an action for self-membership
...
as everything listens to the dispatcher, dispatching an action can be quite slow,
especially when only matched in one listener, and the rest all having to be called
to just say "no, thanks". This is especially the case for the RoomMember.membership
event being put on the dispatcher, as there can be thousands of these events
when the room members are loading.
Since the RoomMember.membership action is only used on one place,
and only for the syncing user, change it to just that and only dispatch
in that case. This saves 100-300ms when setting the OOB members in
a big room (7000k members)
Maybe later on we can back this by room.getMyMembership() and avoid the
listener even...
2018-09-07 19:53:01 +02:00
Bruno Windels
aa8e998612
Merge pull request #2153 from matrix-org/bwindels/optimizememberlist
...
avoid unneeded lookups in memberDict
2018-09-07 19:09:00 +02:00
Bruno Windels
467cdd2f1f
Merge branch 'develop' into bwindels/optimizememberlist
2018-09-07 18:32:13 +02:00
David Baker
830edeb9ca
v0.13.4-rc.1
2018-09-07 14:35:44 +01:00
David Baker
1cab61f560
Prepare changelog for v0.13.4-rc.1
2018-09-07 14:35:44 +01:00
David Baker
2380f2cb1f
js-sdk rc.1
2018-09-07 14:31:45 +01:00
David Baker
73c28f3aae
Merge translations from #2157 to release
2018-09-07 14:23:26 +01:00
David Baker
b419652e4e
Merge pull request #2157 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-09-07 14:10:30 +01:00
Weblate
1592e7a22f
Merge remote-tracking branch 'origin/develop' into develop
2018-09-07 12:57:35 +00: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
Jeff Huang
603fe4f92b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1252 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-09-07 12:47:46 +00:00
