matrix-org/matrix-react-sdk

Pull Requests Commits

Cancel deferred actions

dbkr committed 8 years ago

f6cfff90

Merge pull request #1038 from matrix-org/dbkr/ilag_defer_create_room

dbkr committed 8 years ago

3553aea5

Defer an intention for creating a room

dbkr committed 8 years ago

5924654f

Merge pull request #1037 from matrix-org/dbkr/fix_create_room_button_ilag

lukebarnard1 committed 8 years ago

2030c188

Apply https://github.com/matrix-org/matrix-react-sdk/commit/9cae667c063e67b32e60b89e7256d714a056559b to ilag branch

dbkr committed 8 years ago

ad87e9bd

Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background

dbkr committed 8 years ago

85aa3f6f

Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings

dbkr committed 8 years ago

d8e34230

Only view welcome user if we are not looking at a room

Luke Barnard committed 8 years ago

c82e79ab

Merge pull request #1029 from matrix-org/luke/fix-multi-welcome-user

dbkr committed 8 years ago

cdd8cc41

Keep deferred actions for view_user_settings and view_create_chat

Luke Barnard committed 8 years ago

3195b9f9

Don't do a deferred start chat if user is welcome user

Luke Barnard committed 8 years ago

beafb685

Merge pull request #1028 from matrix-org/luke/fix-room-change-peek-spinner

lukebarnard1 committed 8 years ago

d72db5df

Introduce state `peekLoading` to avoid collision with `roomLoading`

Luke Barnard committed 8 years ago

239874cc

Merge pull request #1013 from matrix-org/dbkr/fix_3pid_invite_pwlu

dbkr committed 8 years ago

792f825e

Fix accepting a 3pid invite

dbkr committed 8 years ago

2cc9f9c4

Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors

dbkr committed 8 years ago

ec0ad93a

Remove redundant room_id

dbkr committed 8 years ago

ac0f2f79

Set state from dispatch payload unconditionally

dbkr committed 8 years ago

f52035f3

Merge pull request #1006 from matrix-org/luke/new-guest-access-user-action-chat

lukebarnard1 committed 8 years ago

953a573f

Remove cryptic log

Luke Barnard committed 8 years ago

95e38eb9

Propagate room join errors to the UI

dbkr committed 8 years ago

03f4f269

Display profile errors better

Luke Barnard committed 8 years ago

6e84b6e9

Luke Barnard committed 8 years ago

e88b52fa

Remove redundant state

Luke Barnard committed 8 years ago

6a9781f0

Implement /user/@userid:domain?action=chat

Luke Barnard committed 8 years ago

defecb1b

Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips

lukebarnard1 committed 8 years ago

be7c2612

Merge pull request #995 from matrix-org/luke/new-guest-access-fix-wrong-room-shown

dbkr committed 8 years ago

d81160d5

Modify RVS test to wait until room loaded

Luke Barnard committed 8 years ago

7808994b

Fix to show the correct room

Luke Barnard committed 8 years ago

16c4c14a

Luke Barnard committed 8 years ago

dd48b3f0

Older