matrix-org/matrix-react-sdk

Pull Requests Commits

Merge remote-tracking branch 'origin/develop' into dbkr/remove_session_load_error

dbkr committed 8 years ago

dff79984

Merge pull request #782 from matrix-org/dbkr/matrixchat_tidy

dbkr committed 8 years ago

22b0f69a

Merge pull request #781 from matrix-org/luke/fix-flaky-tests-maybe

lukebarnard1 committed 8 years ago

5a411ba0

Remove non-functional session load error

dbkr committed 8 years ago

a6612bb8

Use Login & Register via component interface

dbkr committed 8 years ago

cee2628b

Merge pull request #780 from matrix-org/dbkr/country_dropdown_setstate_warning

dbkr committed 8 years ago

27c945c5

Remove React warning

dbkr committed 8 years ago

e139f521

Attempt to fix the flakyness seen with tests

Luke Barnard committed 8 years ago

2146e89c

Merge pull request #779 from matrix-org/dbkr/rr_echo_only_when_needed

dbkr committed 8 years ago

6f4b0809

Only send local echo RR if we're at the end

dbkr committed 8 years ago

90242c2c

Only clear the local notification count if needed

dbkr committed 8 years ago

3373f00d

Merge pull request #777 from matrix-org/dbkr/fix_notifs_on_refresh

dbkr committed 8 years ago

e90897d1

Don't re-notify about messages on browser refresh

dbkr committed 8 years ago

4587b5f9

Merge pull request #775 from matrix-org/luke/fix-RoomList-notif-flashing

dbkr committed 8 years ago

91d10646

Do not send the room with action

Luke Barnard committed 8 years ago

4a0988f8

Improve zeroing of RoomList notification badges

Luke Barnard committed 8 years ago

f4dc7ae8

Merge pull request #774 from matrix-org/luke/fix-voip-bar-hidden

dbkr committed 8 years ago

e1b73478

Fix VOIP bar hidden on first render of RoomStatusBar

Luke Barnard committed 8 years ago

ffd8ef84

Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick

dbkr committed 8 years ago

a38a954f

Merge pull request #773 from matrix-org/luke/fix-login-flash-new-state

lukebarnard1 committed 8 years ago

aa486b60

Merge pull request #771 from matrix-org/dbkr/invite_always_show_valid_mxid

dbkr committed 8 years ago

c743663f

logged_in -> loggedIn

Luke Barnard committed 8 years ago

c650cfff

I still can't type

dbkr committed 8 years ago

db3339de

dbkr committed 8 years ago

9125c1b2

Correct confirm prompt for disinvite

dbkr committed 8 years ago

a3efa457

Fix bug where you can't invite a valid address

dbkr committed 8 years ago

a230354d

Add state loggingIn to MatrixChat to fix flashing login

Luke Barnard committed 8 years ago

30c5af35

Merge pull request #761 from matrix-org/luke/fix-people-section2

lukebarnard1 committed 8 years ago

7eb3a776

Merge pull request #770 from matrix-org/luke/fix-read-receipt-offset

lukebarnard1 committed 8 years ago

55351927

Read Receipt offset

Luke Barnard committed 8 years ago

a4b4c3fe

Older