matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified

richvdh committed 9 years ago

67bd2cf9

Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel

dbkr committed 9 years ago

f06de1f1

Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails

dbkr committed 9 years ago

e2edecc5

Use a cancel function

dbkr committed 9 years ago

c42b7054

Missed a `function`

dbkr committed 9 years ago

23a25e55

Set state in _lookupThreepid

dbkr committed 9 years ago

bf66f77a

Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/matrix-react-sdk into matthew/warn-unknown-devices

richvdh committed 9 years ago

60d75751

explicitly set device known-ness

ara4n committed 9 years ago

ebf6ba89

Factor out common onSendMessageFailed

richvdh committed 9 years ago

70190be6

Refactor UnknownDeviceDialog

richvdh committed 9 years ago

5da6ca8f

Merge branch 'develop' into matthew/warn-unknown-devices

richvdh committed 9 years ago

5538ce7c

Fix cancel button on e2e import/export dialogs

richvdh committed 9 years ago

81d95ece

Look up email addresses in ChatInviteDialog

dbkr committed 9 years ago

e1e87807

Merge pull request #652 from matrix-org/kegan/rageshake-glue

kegsay committed 9 years ago

c3616fd2

Merge pull request #651 from matrix-org/rav/roomheader_theming_fix

dbkr committed 9 years ago

12642bdf

Merge pull request #649 from matrix-org/rav/stack_dialogs

dbkr committed 9 years ago

8a5e19f6

Merge branch 'develop' into matthew/warn-unknown-devices

richvdh committed 9 years ago

a2dd1fa0

Revert accidental change

richvdh committed 9 years ago

21f3aeac

We no longer supply a BugReportDialog

kegsay committed 9 years ago

e9de34ec

Fix dark theme styling of roomheader cancel button

richvdh committed 9 years ago

5099f075

Move BugReportDialog to riot-web

kegsay committed 9 years ago

bea6df88

Factor out common CancelButton

richvdh committed 9 years ago

55dc2e01

Merge pull request #642 from matrix-org/kegan/rageshake-ui

kegsay committed 9 years ago

e5fde759

Merge pull request #625 from matrix-org/dbkr/user_search_feedback

dbkr committed 9 years ago

a3b93842

Merge branch 'develop' into kegan/rageshake-ui

kegsay committed 9 years ago

602ce37b

Merge pull request #647 from matrix-org/rav/megolm_backup_ui

richvdh committed 9 years ago

dc7a1697

Doc state in getinitialstate

dbkr committed 9 years ago

ced1c45a

Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality

richvdh committed 9 years ago

9cadc2f5

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

richvdh committed 9 years ago

ebe6cddd

Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down

richvdh committed 9 years ago

69b55fd9

Newer Older