matrix-org/matrix-react-sdk

Pull Requests Commits

Merge remote-tracking branch 'origin/develop' into develop

Weblate committed 7 years ago

4d3afd1d

Translated using Weblate (Esperanto)

tuxayo committed 7 years ago

10205806

Merge pull request #2170 from matrix-org/bwindels/disablelle2etests

bwindels committed 7 years ago

Verified 42c148f3

pass --travis flag to e2e tests to disable tests known not to work on travis CI because of dinosaur ubuntu version

bwindels committed 7 years ago

8d9850b7

Translated using Weblate (French)

Kévin C committed 7 years ago

e5b151ea

Translated using Weblate (Hungarian)

szimszon committed 7 years ago

c2c735d5

bwindels committed 7 years ago

e951a22d

Merge remote-tracking branch 'origin/develop' into develop

Weblate committed 7 years ago

042bbca4

Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases

ara4n committed 7 years ago

Verified d39889e2

Merge remote-tracking branch 'origin/develop' into develop

Weblate committed 7 years ago

c78ccd78

Translated using Weblate (Lithuanian)

welaq committed 7 years ago

23c91f22

Translated using Weblate (Esperanto)

tuxayo committed 7 years ago

719f7c6d

fix NPE on name (related to LL?)

ara4n committed 7 years ago

ece041d0

remove i18n used by RoomAliasesEvent

ara4n committed 7 years ago

fc81dbbf

remove initial parameter and show available members on invite instead

bwindels committed 7 years ago

8c4f4765

mounted can be set straight in componentWillMount

bwindels committed 7 years ago

0727e0f8

bwindels committed 7 years ago

e8b47709

check LL with client as this takes server support into account

bwindels committed 7 years ago

841aa4b8

pass membersLoaded state to TimelinePanel to force it to re-render

bwindels committed 7 years ago

0ce7bb89

remove RoomAliasesEvent in favour of simpler textual event

ara4n committed 7 years ago

0e1a814d

pass room to _loadMembersIfJoined, it's called when newState not applied

bwindels committed 7 years ago

473f2dd7

remove untrue comment, as we only load the members when joining

bwindels committed 7 years ago

e0a789f7

better naming and document method

bwindels committed 7 years ago

e1b9aa96

switch back to simple TextForEvent

ara4n committed 7 years ago

dc7212ec

remove dead code

bwindels committed 7 years ago

d276b17c

show empty list as initial state instead of spinner

bwindels committed 7 years ago

c3914d34

use Room.myMembership event instead of RoomMember.membership for me

bwindels committed 7 years ago

2ed41449

Merge remote-tracking branch 'origin/develop' into develop

Weblate committed 7 years ago

f8478f06

Translated using Weblate (Indonesian)

monkeymagic29 committed 7 years ago

06a74707

Translated using Weblate (German)

xyzi committed 7 years ago

0ae37f27

Newer Older