matrix-org/matrix-react-sdk

Pull Requests Commits

Add null check to start_login

Luke Barnard committed 8 years ago

47958180

Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus

lukebarnard1 committed 8 years ago

5e93dde0

Merge pull request #748 from matrix-org/luke/logout-after-deactivate

dbkr committed 8 years ago

0e959269

Merge pull request #745 from matrix-org/luke/UDE-file-upload

lukebarnard1 committed 8 years ago

c717dc02

Merge branch 'develop' into luke/UDE-file-upload

lukebarnard1 committed 8 years ago

17c9fcbb

Merge pull request #743 from matrix-org/luke/fix-screen-after-login

dbkr committed 8 years ago

30b44251

Fix import for Lifecycle

Luke Barnard committed 8 years ago

ba0715ba

fix kick dialog CSS

ara4n committed 8 years ago

925bbb79

fix CSS for ChatCreateOrReuseDialog.js

ara4n committed 8 years ago

8a0b08e7

name class to match file

ara4n committed 8 years ago

bf64f387

name class to match file

ara4n committed 8 years ago

3a849bce

ara4n committed 8 years ago

185473b8

beautify a tonne more errors

ara4n committed 8 years ago

3aaf37df

beautify search fail error

ara4n committed 8 years ago

71e0780e

ara4n committed 8 years ago

e5a5b5cd

beautify UserSettings error msg

ara4n committed 8 years ago

b7d5d2fd

Revert "Support registration & login with phone number (#742)"

richvdh committed 8 years ago

2786fb0f

Merge pull request #744 from matrix-org/luke/add-onclick-permalinks

ara4n committed 8 years ago

7fb9ce2b

Merge pull request #605 from SijmenSchoon/feature/pastefiles

ara4n committed 8 years ago

6c7b1915

Merge the two RoomTile context menus into one

Luke Barnard committed 8 years ago

1f788fea

Support registration & login with phone number (#742)

dbkr committed 8 years ago

02695623

Make UDD appear when UDE on uploading a file

Luke Barnard committed 8 years ago

4f791481

Merge branch 'develop' into luke/add-onclick-permalinks

lukebarnard1 committed 8 years ago

c98a2144

Luke Barnard committed 8 years ago

173daddb

Merge pull request #739 from matrix-org/luke/visible-redactions

dbkr committed 8 years ago

676c5c21

Add onClick to permalinks to route within Riot

Luke Barnard committed 8 years ago

2513bfa6

Use else instead of two returns

Luke Barnard committed 8 years ago

c4001b5c

Make sure the screen is set, otherwise ignore screenAfterLogin

Luke Barnard committed 8 years ago

eca82bdb

Decide on which screen to show after login in one place

Luke Barnard committed 8 years ago

06a05c35

Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog

lukebarnard1 committed 8 years ago

b7f1b1a4

Older