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

11979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
c6fa8ea24c show canonical aliases in timeline, and set/remove implicit ones 2018-09-20 01:07:01 +01:00
Weblate
abe6d72125 Merge remote-tracking branch 'origin/develop' into develop 2018-09-19 11:35:23 +00:00
Bruno Windels
b431292f6e
Merge pull request #2168 from matrix-org/bwindels/fixstalerr 
Fix stale RR and improve LL reliability in RoomView & MemberList.
 2018-09-19 13:35:17 +02:00
Bruno Windels
920e0d397c Merge branch 'develop' into bwindels/fixstalerr 2018-09-19 12:15:41 +02:00
Bruno Windels
93d34e7b3d fix lint 2018-09-19 12:00:29 +02:00
random
909e4052bc Translated using Weblate (Italian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-09-19 09:21:23 +00:00
Weblate
4d3afd1dc1 Merge remote-tracking branch 'origin/develop' into develop 2018-09-19 09:05:12 +00:00
Victor Grousset
1020580653 Translated using Weblate (Esperanto) 
Currently translated at 87.5% (1100 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-09-19 09:05:11 +00:00
Bruno Windels
42c148f330
Merge pull request #2170 from matrix-org/bwindels/disablelle2etests 
pass --travis flag to e2e tests to disable tests known not to work Travis CI
 2018-09-19 11:05:05 +02:00
Bruno Windels
8d9850b7e7 pass --travis flag to e2e tests to disable tests known not to work on travis CI because of dinosaur ubuntu version 2018-09-19 10:57:47 +02:00
Kévin C
e5b151ea26 Translated using Weblate (French) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-09-18 21:48:21 +00:00
Szimszon
c2c735d521 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-09-18 18:48:51 +00:00
Bruno Windels
e951a22d31 fix tests 2018-09-18 17:09:14 +02:00
Weblate
042bbca473 Merge remote-tracking branch 'origin/develop' into develop 2018-09-18 10:14:50 +00: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
Weblate
c78ccd7856 Merge remote-tracking branch 'origin/develop' into develop 2018-09-17 23:16:36 +00:00
Moo
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
Victor Grousset
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
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
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
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