matrix-org/matrix-react-sdk

Pull Requests Commits

Land refactored roomview branch 'rav/roomview_works'.

richvdh committed 9 years ago

1959b031

Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups

richvdh committed 9 years ago

1009faf9

Merge pull request #170 from matrix-org/rav/video_resize

richvdh committed 9 years ago

7a19bad3

Make the initialSyncLimit configurable

richvdh committed 9 years ago

4ce35982

dbkr committed 9 years ago

4b13d71b

Use new release of js-sdk

dbkr committed 9 years ago

cd92f0ea

Don't update state when no change to read marker

richvdh committed 9 years ago

1e095e10

remove some dead code

richvdh committed 9 years ago

9db58de1

Merge branch 'rav/roomview_works' into rav/read_marker

richvdh committed 9 years ago

4f417f7a

Merge branch 'rav/roomview_works' into rav/read_marker

richvdh committed 9 years ago

029f47d9

reinstate event-continuation logic

richvdh committed 9 years ago

68e0192a

Register a s a guest even if email invite: this is ok now.

dbkr committed 9 years ago

3f51cda8

Don't redirect to registration on 3pid invite: it's ok to be a guest now.

dbkr committed 9 years ago

e2bafcbf

Merge pull request #172 from matrix-org/dbkr/guest_access_by_default

dbkr committed 9 years ago

f1dd3d38

Comment guest access initial state

dbkr committed 9 years ago

b2b73540

Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this.

dbkr committed 9 years ago

418bf8e3

Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites

dbkr committed 9 years ago

b384d8c9

Don't forceUpdate the whole roomview on typing notifs

richvdh committed 9 years ago

07822e20

Factor out a separate auxpanel, and cleanup the maxHeight management

richvdh committed 9 years ago

7a20fda7

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

richvdh committed 9 years ago

d599c8fb

Merge pull request #169 from matrix-org/rav/regemini_on_status_update

richvdh committed 9 years ago

2c1b353c

Merge branch 'develop' into rav/roomview_works

richvdh committed 9 years ago

e656cbe8

Merge commit '99d2392' into rav/roomview_works

richvdh committed 9 years ago

ac4b36c0

Merge commit '3f1db5a' into rav/roomview_works

richvdh committed 9 years ago

862e3c8c

Merge commit '26e6632' into rav/roomview_works

richvdh committed 9 years ago

4a22fb97

Merge commit 'd7b3a24' into rav/roomview_works

richvdh committed 9 years ago

21850d7e

Merge commit '71e2495' into rav/roomview_works

richvdh committed 9 years ago

9eff4268

Merge commit 'd2a731e' into rav/roomview_works

richvdh committed 9 years ago

6aaced04

Merge commit '9a0ea56' into rav/roomview_works

richvdh committed 9 years ago

776b6a26

Merge commit 'e972686' into rav/roomview_works

richvdh committed 9 years ago

b1093f3f

Newer Older