e951a22d31
fix tests
2018-09-18 17:09:14 +02:00
042bbca473
Merge remote-tracking branch 'origin/develop' into develop
2018-09-18 10:14:50 +00:00
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
c78ccd7856
Merge remote-tracking branch 'origin/develop' into develop
2018-09-17 23:16:36 +00:00
23c91f22ef
Translated using Weblate (Lithuanian)
...
Currently translated at 69.4% (870 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-09-17 23:16:35 +00:00
719f7c6d01
Translated using Weblate (Esperanto)
...
Currently translated at 87.8% (1100 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-09-17 23:16:35 +00:00
ece041d059
fix NPE on name (related to LL?)
2018-09-18 00:16:25 +01:00
fc81dbbfad
remove i18n used by RoomAliasesEvent
2018-09-17 22:40:00 +01:00
8c4f4765df
remove initial parameter and show available members on invite instead
2018-09-17 20:03:01 +02:00
0727e0f8d3
mounted can be set straight in componentWillMount
2018-09-17 20:02:15 +02:00
e8b4770940
fix lint
2018-09-17 20:01:55 +02:00
841aa4b800
check LL with client as this takes server support into account
2018-09-17 19:28:06 +02:00
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
0e1a814d23
remove RoomAliasesEvent in favour of simpler textual event
2018-09-17 18:27:17 +01:00
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
e0a789f77e
remove untrue comment, as we only load the members when joining
2018-09-17 19:21:22 +02:00
e1b9aa9626
better naming and document method
2018-09-17 19:20:26 +02:00
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
d276b17c2a
remove dead code
2018-09-17 19:19:07 +02:00
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
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
f8478f0644
Merge remote-tracking branch 'origin/develop' into develop
2018-09-17 09:22:04 +00:00
06a74707de
Translated using Weblate (Indonesian)
...
Currently translated at 29.8% (374 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/id/
2018-09-17 09:22:03 +00:00
0ae37f2796
Translated using Weblate (German)
...
Currently translated at 99.6% (1248 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-09-17 09:22:03 +00:00
647ab09b43
Translated using Weblate (Esperanto)
...
Currently translated at 87.8% (1100 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-09-17 09:22:03 +00:00
3f7e7f8da5
Translated using Weblate (English (United States))
...
Currently translated at 65.4% (820 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2018-09-17 09:22:03 +00:00
8a1c85f7a0
Translated using Weblate (Catalan)
...
Currently translated at 80.3% (1006 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-09-17 09:22:02 +00:00
33f648a6f6
Translated using Weblate (Basque)
...
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/eu/
2018-09-17 09:22:02 +00:00
6e12399fe9
Translated using Weblate (Arabic)
...
Currently translated at 5.4% (68 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/
2018-09-17 09:22:02 +00:00
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
003083d9fc
fix plurals
2018-09-16 20:19:02 +01:00
a4b7348703
fix merge on i18n again
2018-09-16 19:11:11 +01:00
599697ca2f
fix merge on i18n
2018-09-16 19:08:31 +01:00
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
86cbe34181
rerender after members are loaded so pills and RR get rerendered
2018-09-14 18:35:16 +02:00
7fcedbc65d
Translated using Weblate (Italian)
...
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/it/
2018-09-14 15:00:51 +00:00
8121fbe428
Merge remote-tracking branch 'origin/develop' into develop
2018-09-14 14:43:00 +00:00
8ed411cd43
Translated using Weblate (Spanish)
...
Currently translated at 99.7% (1249 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-09-14 14:42:59 +00:00
62c763da60
Translated using Weblate (Esperanto)
...
Currently translated at 87.8% (1100 of 1252 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-09-14 14:42:59 +00:00
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
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
27c496aecb
remove unneeded async keywords
2018-09-14 13:55:47 +02:00
fe734b944e
remove obsolete warning as peeking will cause the membership to be null
2018-09-13 18:45:38 +02:00
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
b4815d1a07
Merge remote-tracking branch 'origin/develop' into develop
2018-09-11 12:03:14 +00:00
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
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
1e6e82c3cf
Merge remote-tracking branch 'origin/develop' into develop
2018-09-11 08:57:34 +00:00
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
e99f42a743
Merge remote-tracking branch 'origin/develop' into develop
2018-09-11 08:54:34 +00:00
Bruno Windels