e139f5212a
Remove React warning
...
Fire onOptionChange in componentWillMount, otherwise end up trying
to update state effectively in a render method, which is bad.
2017-03-29 15:05:49 +01:00
6f4b080934
Merge pull request #779 from matrix-org/dbkr/rr_echo_only_when_needed
...
Only clear the local notification count if needed
2017-03-29 14:34:31 +01:00
90242c2c85
Only send local echo RR if we're at the end
2017-03-29 14:12:50 +01:00
3373f00d90
Only clear the local notification count if needed
...
Only zero the local notification count when we actually send a
read receipt, otherwise we cause a re-render of the RoomList every
time the user moves the cursor in the window, basically.
2017-03-29 14:08:31 +01:00
e90897d117
Merge pull request #777 from matrix-org/dbkr/fix_notifs_on_refresh
...
Don't re-notify about messages on browser refresh
2017-03-28 15:16:12 +01:00
4587b5f995
Don't re-notify about messages on browser refresh
...
Don't notify unless the js-sdk state is SYNCING, otherwise we'll
display notifications for messages that come in during the
incremental between the js-sdk cached data and the present.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/405
Fixes https://github.com/vector-im/riot-web/issues/3251
2017-03-28 15:02:08 +01:00
91d10646b5
Merge pull request #775 from matrix-org/luke/fix-RoomList-notif-flashing
...
Improve zeroing of RoomList notification badges
2017-03-28 11:33:38 +01:00
4a0988f83e
Do not send the room with action
...
By not sending the room with the action, we prevent its state from being updated by registered views listening for on_room_read
2017-03-28 11:26:40 +01:00
f4dc7ae8b1
Improve zeroing of RoomList notification badges
...
Use an action and force an update when zeroing the number of notifications in a room. This is better than waiting for a `render` to happen at some point. This will hopefully fix https://github.com/vector-im/riot-web/issues/3257
2017-03-28 10:38:57 +01:00
e1b7347810
Merge pull request #774 from matrix-org/luke/fix-voip-bar-hidden
...
Fix VOIP bar hidden on first render of RoomStatusBar
2017-03-28 10:03:21 +01:00
ffd8ef84d6
Fix VOIP bar hidden on first render of RoomStatusBar
...
componentDidUpdate is not called for the initial render of a React component (https://facebook.github.io/react/docs/react-component.html#componentdidupdate )
componentWillMount is used so that the initial state and props of RoomStatusBar can also trigger props.isVisible.
This fixes https://github.com/vector-im/riot-web/issues/3181
2017-03-28 09:30:41 +01:00
a38a954fb5
Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick
...
Correct confirm prompt for disinvite
2017-03-27 17:42:39 +01:00
aa486b605d
Merge pull request #773 from matrix-org/luke/fix-login-flash-new-state
...
Add state loggingIn to MatrixChat to fix flashing login
2017-03-27 18:24:49 +02:00
c743663f7d
Merge pull request #771 from matrix-org/dbkr/invite_always_show_valid_mxid
...
Fix bug where you can't invite a valid address
2017-03-27 17:20:51 +01:00
c650cfffac
logged_in -> loggedIn
...
Also added `loggingIn` to `initialState` and removed some commented code.
2017-03-27 17:14:39 +01:00
db3339de33
I still can't type
2017-03-27 17:03:59 +01:00
9125c1b2cc
I can't type
2017-03-27 17:00:05 +01:00
a3efa45795
Correct confirm prompt for disinvite
...
It should be 'disinvite' not 'kick', and probably doesn't really
need a reason.
2017-03-27 16:53:00 +01:00
a230354dbe
Fix bug where you can't invite a valid address
...
Always show the entered text as an option if it's a valid address,
otherwise there's no way to invite an address that is valid and
also returns other mxids in the search results.
Fixes https://github.com/vector-im/riot-web/issues/3496
2017-03-27 16:40:01 +01:00
30c5af35e5
Add state loggingIn to MatrixChat to fix flashing login
...
To prevent the login screen from flashing when refreshing the app, use some state to indicate that a login is in progress, and OR that with the existing `loading` boolean to show the `<Spinner>` instead of the default `<Login>`.
This might be too invasive, and a default spinner may be better.
2017-03-27 16:39:04 +01:00
7eb3a776dc
Merge pull request #761 from matrix-org/luke/fix-people-section2
...
Fix people section DropTarget and refactor Rooms
2017-03-27 15:52:28 +02:00
55351927d7
Merge pull request #770 from matrix-org/luke/fix-read-receipt-offset
...
Read Receipt offset
2017-03-27 15:51:57 +02:00
a4b4c3feb8
Read Receipt offset
...
Read receipts were always one read receipt to the left further than they should have been. This fixes that and simplifies the logic.
2017-03-27 14:34:05 +01:00
dca02d916a
Merge branch 'develop' into luke/fix-people-section2
2017-03-27 09:45:14 +01:00
975a2db3e4
UI delay done in UI
2017-03-27 09:42:04 +01:00
a8d85ca2ad
Merge pull request #756 from matrix-org/dbkr/add_msisdn
...
Support adding phone numbers in UserSettings
2017-03-24 10:54:22 +00:00
5e3b991ec2
PR feedback fixes
2017-03-24 10:45:38 +00:00
df15c9be55
Merge pull request #769 from matrix-org/dbkr/dont_crash_on_login
...
Prevent crash on login of no guest session
2017-03-23 14:20:10 +00:00
707fd60624
Prevent crash on login of no guest session
...
The bound functions are only set when the Notifier is started, so
if stop() was called without start() having been called, the
listener function would be null which would throw an exception.
2017-03-23 10:38:00 +00:00
d5272149f6
Another unmounted guard
2017-03-22 16:42:44 +00:00
b58d8bffe1
More PR feedback
...
Unmounted guards, extra semicolon, return early to lose indent
level, add keys.
2017-03-22 16:41:08 +00:00
3d71cb8325
Merge pull request #768 from matrix-org/kegan/memleaks-are-bad-mkay
...
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 16:39:07 +00:00
6b78440466
Unmounted guard
2017-03-22 16:36:42 +00:00
e39979a61f
Convert to old style react class
2017-03-22 16:15:45 +00:00
cca607d469
Make phone number form a bit more semantic
2017-03-22 15:39:09 +00:00
4cd24d15d4
Factor out AddPhoneNumber to a separate component
2017-03-22 15:18:27 +00:00
4cebded04f
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 15:06:52 +00:00
6a37fc4325
Comment typos
2017-03-22 12:00:16 +00:00
fc9928ce08
Merge pull request #767 from matrix-org/dbkr/recaptcha_show_busy
...
Show spinner whilst processing recaptcha response
2017-03-22 11:56:11 +00:00
6a56828974
Just return the promise if it's a bg request
...
This makes the code a bit neater.
2017-03-22 11:25:33 +00:00
5ae7d5e4b2
More comments
2017-03-22 11:13:00 +00:00
e5a5ca9efc
Don't set busy state at all for background request
2017-03-22 10:53:15 +00:00
ec63e18b42
Show spinner whilst processing recaptcha response
...
The fact that we showed no feedback whilst submitting the captcha
response was causing confusion on slower connections where this
took a nontrivial amount of time.
Takes a new flag from the js-sdk that indicates whether the
request being made is a background request, presenting a spinner
appropriately.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/396
2017-03-21 18:40:41 +00:00
d5f7b3983b
Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn
2017-03-21 13:44:55 +00:00
4a29d674f8
Merge pull request #750 from matrix-org/dbkr/msisdn_signin_2
...
Login / registration with phone number, mark 2
2017-03-21 13:43:11 +00:00
fefaf66a81
Merge pull request #758 from matrix-org/dbkr/threepid_display
...
Display threepids slightly prettier
2017-03-21 11:22:56 +00:00
9ccda7ed81
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-21 11:11:45 +00:00
f65cc940c3
Merge pull request #764 from lieuwex/fix-extraneous-space-emote
...
Fix extraneous leading space in sent emotes
2017-03-19 21:34:13 +00:00
bf8973ad33
avoid leading space in HTML /me too
2017-03-19 21:33:18 +00:00
c697b48f99
fix leading extraneous space in emotes
2017-03-19 21:52:24 +01:00
David Baker