mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
11706 commits 203 branches 553 tags 406 MiB
Commit graph

11706 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthew Hodgson
0e1a814d23 remove RoomAliasesEvent in favour of simpler textual event 2018-09-17 18:27:17 +01: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
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
Weblate
f8478f0644 Merge remote-tracking branch 'origin/develop' into develop 2018-09-17 09:22:04 +00:00
Andri
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
xyzi
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
Victor Grousset
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
Tim Stahel
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
Simó Albert i Beltran
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
Osoitz
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
ali almi
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
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
Bruno Windels
86cbe34181 rerender after members are loaded so pills and RR get rerendered 2018-09-14 18:35:16 +02:00
random
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
Weblate
8121fbe428 Merge remote-tracking branch 'origin/develop' into develop 2018-09-14 14:43:00 +00:00
Milena Brum
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
Victor Grousset
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
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
Weblate
b4815d1a07 Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 12:03:14 +00: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
Weblate
1e6e82c3cf Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 08:57:34 +00: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
Weblate
e99f42a743 Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 08:54:34 +00:00
Milena Brum
cf591244e6 Translated using Weblate (Spanish) 
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/es/
 2018-09-11 08:54:34 +00: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
Weblate
ca771ec912 Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 15:31:37 +00: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
Weblate
e5d334a4e8 Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 15:30:48 +00:00
Kenneth Larsson
2f6b529eb3 Translated using Weblate (Swedish) 
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/sv/
 2018-09-10 15:30:47 +00:00