matrix-org/matrix-react-sdk

Pull Requests Commits

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

remove obsolete warning as peeking will cause the membership to be null

bwindels committed 7 years ago

fe734b94

postpone loading the members until the user joined the room

bwindels committed 7 years ago

f194f323

Merge pull request #2164 from matrix-org/dbkr/dont_exit_fullscreen_when_not

dbkr committed 7 years ago

Verified 518be24a

Don't try to exit fullscreen if not fullscreen

dbkr committed 7 years ago

d3038ea7

Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading

bwindels committed 7 years ago

Verified ecaabd6b

Merge pull request #2163 from matrix-org/bwindels/logllfailroomidcorrectly

dbkr committed 7 years ago

Verified 666c9a68

even better as the method called is on room

bwindels committed 7 years ago

deaad4bc

fix logging room id when LL members fail

bwindels committed 7 years ago

694ee5a2

dont assign member in getInitialState

bwindels committed 7 years ago

2aaf3e6b

missed one {} -> [], fix e2e tests

bwindels committed 7 years ago

92f7e291

Merge pull request #2162 from matrix-org/bwindels/dontspinaftermemberserror

bwindels committed 7 years ago

Verified f0e33dff

Merge pull request #2160 from matrix-org/bwindels/selfmembershipaction

bwindels committed 7 years ago

Verified ab931e0f

add final return for clarity

bwindels committed 7 years ago

dcc8a45a

dont keep the spinner in the memberlist when fetching /members fails

bwindels committed 7 years ago

5044d4f2

Merge branch 'master' into develop

dbkr committed 7 years ago

832a73d4

Merge branch 'release-v0.13.4'

dbkr committed 7 years ago

60e55594

dbkr committed 7 years ago

405f0bcf

Prepare changelog for v0.13.4

dbkr committed 7 years ago

bb37e36e

dbkr committed 7 years ago

f99aef8e

remove layering warnings

ara4n committed 7 years ago

ef20813f

downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57

ara4n committed 7 years ago

86c92ee5

point deps at #develop to unbreak npm i

ara4n committed 7 years ago

b8bfed13

Newer Older