7b405d0d9c
Don't setState after unmounting a component
...
Fix a warning which happens if a LinkPreviewWidget is unmounted before the
preview request completes.
Also add missing .done to promise chain
2016-04-18 14:52:41 +01:00
a95c45eb96
final(?) PR fixes
2016-04-18 14:48:55 +01:00
8e1b0ee0a9
Merge pull request #274 from matrix-org/rav/drop_onload_workaround
...
Drop workaround for object.onLoad
2016-04-18 14:12:51 +01:00
60f92fd15b
PR feedback
2016-04-18 14:07:20 +01:00
b2d0950a46
oops, remove debug logging
2016-04-18 01:45:46 +01:00
b949e78683
Improve ordering of memberlist by absolutizing lastActive correctly
...
Change ordering of memberlist to not try to compare lastActive of 'currentlyActive' users, as lastActive may will be a complete lie as it only gets updated when currentlyActive transitions to false (i think?)
Remove order by online/idle/offline in favour of "currently active, ordered by power and then alphabetic name, followed by last active, followed by offline"
Add commented-out code to track last-spoken-within-a-room ordering.
Fix kludges due to SYJS-28 (depends on JS PR landing)
2016-04-18 01:35:40 +01:00
eeb9abdf81
trailing whitespace
2016-04-18 01:34:45 +01:00
716eb1eb1b
Drop workaround for object.onLoad
...
https://github.com/facebook/react/pull/5781 has been fixed in React 15.0, so
drop our workaroud for it.
2016-04-17 21:46:27 +01:00
3cde22169e
Upgrade to react 15.0
...
Needs a new react-gemini-scrollbar to match.
2016-04-17 21:40:50 +01:00
336d91dadb
Merge pull request #272 from matrix-org/rav/fix_roomname
...
Make sure that we update the room name
2016-04-17 18:12:18 +01:00
f4573bae49
remove premie optimisation of tintablesvg shouldComponentUpdate
2016-04-17 00:28:20 +01:00
8db14bde60
switch Tinter from using dispatch to a synchronous update when changing the colourscheme, to avoid CSS getting out of sync with SVG colours
2016-04-16 01:00:10 +01:00
4fb31662e1
fix tooltip offset
2016-04-15 22:24:12 +01:00
19770563f4
add cancelButton to simpleHeader
2016-04-15 22:16:19 +01:00
8ec13d2752
Merge pull request #273 from matrix-org/matthew/design_tweaks
...
Matthew/design tweaks
2016-04-15 18:48:22 +01:00
009781dac7
prep for RightPanel full collapse
2016-04-15 18:45:40 +01:00
f625e2d693
fix up UserSettings a bit and add fading
2016-04-15 18:30:13 +01:00
a06b420942
wire up searchbox filtering
2016-04-15 17:55:00 +01:00
7c8d7e5361
move memberlist bottom into rightpanel
2016-04-15 15:53:14 +01:00
8680afe46f
Make sure that we update the room name
...
It turns out that RoomState.events is fired before Room.name is updated; make
sure that we pick up the latter and do the update.
2016-04-15 10:01:39 +01:00
26f135c7b0
fix 'undefined' class bug on TintableSvg
2016-04-14 21:44:05 +01:00
2d71d4422e
make selected room more skinnable
2016-04-14 21:11:10 +01:00
0741e8a5c1
fix testing UI hack
2016-04-14 19:11:20 +01:00
81d5e16225
fix @aviraldg thinko on needing a key on arrays :)
2016-04-14 19:11:09 +01:00
21fd5078f9
fix NPE on getEventTileOps
2016-04-14 17:39:45 +01:00
3fd9b29422
Merge pull request #271 from matrix-org/rav/avoid_codepoint_at
...
Hack around absence of String.codePointAt on PhantomJS
2016-04-13 16:37:00 +01:00
85277a237a
Merge pull request #270 from matrix-org/rav/issue_1314_federated_rooms
...
RoomView: Handle joining federated rooms
2016-04-13 16:36:46 +01:00
1e294cb10c
fix 'mark all read'
2016-04-13 12:46:36 +01:00
ec5ca1ca28
s/roomAlias/roomAddress/ to reduce confusion
2016-04-13 12:26:40 +01:00
6509bc0589
oops, missed another fade
2016-04-13 11:17:09 +01:00
ead5418214
oops, missed a fade
2016-04-13 11:17:09 +01:00
047524d093
Merge pull request #269 from matrix-org/rav/stop_client_on_unmount
...
Stop the MatrixClient when the MatrixChat is unmounted
2016-04-13 11:05:02 +01:00
5706a879d0
Hack around absence of String.codePointAt on PhantomJS
...
I've been trying to get some tests working under PhantomJS, which appears not
to support String.codePointAt (which is, to be fair, an ES6 addition). For our
limited usecase, it's easier to implement the functionality from first
principles than to try to polyfill support.
2016-04-13 10:35:07 +01:00
93a142480c
RoomView: Handle joining federated rooms
...
This hopefully fixes an issue where joining a federated room via the directory
would get stuck at a spinner of doom, due to us not recognising the room in
question when it came down the /sync. We now catch the room id in the response
from the /join, and use it to match up the room in onRoom.
props.roomAlias, props.roomId, and state.room.roomId were somewhat confusing,
so I've tried to rationalise them:
* props.roomAlias (named thus to stop you assuming it's a room id) is the
thing that the parent component uses to identify the room of interest, and
can be either an ID or an alias (ie, it replaces props.roomId and
props.roomAlias)
* Everything that needs a room ID now has to get it from state.room.roomId.
2016-04-13 08:59:28 +01:00
f3793b556e
fix super-annoying key warning from react
2016-04-13 02:02:55 +01:00
92f58b6927
don't try to do preview URLs of matrix IDs (yet :D)
2016-04-13 01:54:06 +01:00
4b1ff51a42
show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly
2016-04-13 01:46:10 +01:00
bfec6d4ed9
merge aviral's audio player
2016-04-13 00:00:24 +01:00
1361333fdc
Stop the MatrixClient when the MatrixChat is unmounted
...
The MatrixClient never gets unmounted in the real app, but I've been working on
some tests which would rather like to be able to create and destroy MatrixChats
and not have the clients hang around forever.
2016-04-12 18:38:10 +01:00
6a6739e0f3
fix context menu on tiles without widgets
2016-04-12 18:32:55 +01:00
a01e6d46b9
Merge pull request #268 from matrix-org/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:05:10 +01:00
3a2d5c4ba5
spinner on saving room settings
2016-04-12 18:01:49 +01:00
11f3d5f993
make the UI fadable to help with decluttering
2016-04-12 17:18:32 +01:00
fcab259511
Support for email notifs
...
Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff
2016-04-12 16:17:04 +01:00
1d5f234f2c
add 'mark all read' button
2016-04-12 14:29:36 +01:00
089963b4c7
timestamps are permalinks
2016-04-12 13:33:59 +01:00
38d27cdbb0
improve 'no known servers' error
2016-04-12 13:00:52 +01:00
f9785f68af
filter out conference bots from membership list
2016-04-12 01:54:51 +01:00
bf1e0da598
fix ability to save room settings if you don't have ops
2016-04-12 01:27:12 +01:00
f9c7ae1ab9
Merge pull request #260 from matrix-org/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:15 +01:00
Richard van der Hoff