matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into bwindels/fixstalerr

bwindels committed 7 years ago

920e0d39

bwindels committed 7 years ago

93d34e7b

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

bwindels committed 7 years ago

e951a22d

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

ara4n committed 7 years ago

Verified d39889e2

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 pull request #2165 from matrix-org/bwindels/fixllpeeking

dbkr committed 7 years ago

Verified f6512611

ara4n committed 7 years ago

003083d9

fix merge on i18n again

ara4n committed 7 years ago

a4b73487

fix merge on i18n

ara4n committed 7 years ago

599697ca

merge in develop

ara4n committed 7 years ago

3b868064

rerender after members are loaded so pills and RR get rerendered

bwindels committed 7 years ago

86cbe341

Merge pull request #2166 from matrix-org/dbkr/allow_non_literal_translations

dbkr committed 7 years ago

Verified 77d5daf9

Allow translation tags object to be a variable

dbkr committed 7 years ago

Verified e1394d59

remove unneeded async keywords

bwindels committed 7 years ago

27c496ae

Older