Matthew Hodgson
46205ad83c
back out small avatars for emotes for now as they conflict with the E2E artwork.
...
they will be reintroduced once we have lozenges
2016-09-11 22:49:05 +01:00
Matthew Hodgson
64dedef2c7
fix wordwrap on new panels
2016-09-11 21:55:57 +01:00
Matthew Hodgson
83209197f4
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:38:16 +01:00
Matthew Hodgson
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +01:00
Matthew Hodgson
3a8c94de5a
CSS for notif & file panel
2016-09-11 02:15:03 +01:00
Matthew Hodgson
dd39813cc2
show context menus on hoverover
2016-09-11 02:14:52 +01:00
Matthew Hodgson
34bb37aaba
layout for file & notif panel
2016-09-11 02:14:27 +01:00
Matthew Hodgson
bae6409edb
show badge menu on RoomTile hoverover
2016-09-11 00:30:43 +01:00
Matthew Hodgson
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
2016-09-10 10:46:30 +01:00
Matthew Hodgson
6f270fd621
remove debug
2016-09-10 01:39:19 +01:00
Matthew Hodgson
e6c4273404
Merge pull request #2151 from vector-im/dbkr/memberinfo_createroom_cursor_pointer
...
Cursor: pointer on member info create room button
2016-09-09 22:33:37 +01:00
Matthew Hodgson
86da0e0d63
Merge pull request #459 from VShell/fix-cas
...
Fix CAS support by using a temporary Matrix client
2016-09-09 21:19:19 +01:00
Shell Turner
1380bf705a
Fix CAS support by using a temporary Matrix client
...
Signed-off-by: Shell Turner <cam.turn@gmail.com >
2016-09-09 21:01:10 +01:00
David Baker
96fabe09d2
Update createRoom to support creating DM rooms
...
* Make ChatInviteDialog and MemberInfo createRoom use it
* Fix bug in setDMRoom
2016-09-09 19:25:00 +01:00
David Baker
e1c32536ff
Cursor: pointer on member info create room button
2016-09-09 19:23:12 +01:00
Matthew Hodgson
8160613e01
Merge pull request #457 from matrix-org/dbkr/dont_crash_if_no_dm_rooms
...
Don't crash if no DM rooms with someone
2016-09-09 18:09:40 +01:00
David Baker
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
2016-09-09 17:38:13 +01:00
David Baker
f1ed750246
Don't crash if no DM rooms with someone
...
...when opening MemberInfo.
getDMRoomsForUserId should always return a valid list, since it's a list of what DM rooms you have with somebody.
2016-09-09 17:35:35 +01:00
David Baker
9cff4d59ca
Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section
...
Don't always show DM rooms in Direct Messages
2016-09-09 17:35:02 +01:00
David Baker
013f68519e
Merge pull request #2147 from vector-im/dbkr/memberinfo_list_rooms
...
Support for adding DM rooms to the MemberInfo Panel
2016-09-09 17:30:35 +01:00
David Baker
78f53bd403
Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms
...
Add DM rooms with that person to the MemberInfo panel
2016-09-09 17:30:32 +01:00
David Baker
4c5db7cc9f
Don't always show DM rooms in Direct Messages
...
Favourites belong in favourites & parted ones belong in Historical, etc.
2016-09-09 17:23:15 +01:00
Matthew Hodgson
fed3f48297
Merge pull request #452 from aviraldg/test-rte
...
Add some tests for the rich text editor
2016-09-09 17:16:04 +01:00
David Baker
6f2e0a4cdf
Make rooms in MemberInfo update when necessary
...
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
2016-09-09 16:59:59 +01:00
David Baker
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +01:00
David Baker
590d6d3ee8
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:22:48 +01:00
David Baker
57804f4e02
Support for common rooms in MemberInfo
...
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.
Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Kegsay
2078f81f33
Merge pull request #454 from matrix-org/kegan/get-room-on-first-load
...
Fix bug whereby refreshing Vector would not allow querying of membership state
2016-09-09 16:15:11 +01:00
David Baker
aa0f15c46e
List common rooms in MemberInfo
2016-09-09 16:15:01 +01:00
Kegan Dougal
9c290c4b8d
Return after sending an error
2016-09-09 16:14:41 +01:00
Kegan Dougal
a306a5e694
Fix bug whereby refreshing Vector would not allow querying of membership state
...
This was caused by Vector only sending a room alias with the `view_room` action.
We now resolve this to a room ID if we don't have a room ID.
2016-09-09 16:06:19 +01:00
Matthew Hodgson
4de0e19ef3
Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators
...
Wmwragg/one to one indicators
2016-09-09 15:08:48 +01:00
Matthew Hodgson
c4421f6bc7
Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators
...
Wmwragg/one to one indicators
2016-09-09 15:08:20 +01:00
wmwragg
a6b0a7d5dc
Should supply the roomId
2016-09-09 15:01:40 +01:00
wmwragg
965d9aaf47
Lowered the Avatar menu background, so the Direct Message indicator is in front of it
2016-09-09 14:56:20 +01:00
wmwragg
2476f87e1d
Positional tweaks for the new Direct Message indicator
2016-09-09 14:47:26 +01:00
wmwragg
cd36800426
New direct message indicator CSS
2016-09-09 14:42:11 +01:00
wmwragg
17b75a589f
Added the little green men for direct message rooms
2016-09-09 14:36:51 +01:00
wmwragg
18eb9d9330
Made sure the z-index was correct for the new little green men
2016-09-09 14:36:21 +01:00
Richard van der Hoff
17e763e8e6
Merge pull request #451 from matrix-org/rav/deviceinfo
...
Update MemberDeviceInfo display
2016-09-09 14:08:42 +01:00
Matthew Hodgson
7e379e9877
Merge pull request #2136 from vector-im/wmwragg/room-directory-back
...
Added back the Directory listing button, with new tootlip
2016-09-09 14:08:19 +01:00
Matthew Hodgson
f2ca249b44
Merge pull request #2134 from vector-im/wmwragg/chat-invite-dialog-fix
...
wmwragg/chat invite dialog fix
2016-09-09 14:08:09 +01:00
Aviral Dasgupta
fec1e4d4c1
Add some tests for the rich text editor
2016-09-09 18:07:42 +05:30
wmwragg
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +01:00
wmwragg
bfa59c6c04
Increased the width of the query list container to take account of scrollbars
2016-09-09 11:42:57 +01:00
Richard van der Hoff
b724b0c6b6
Update MemberDeviceInfo display
...
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
2016-09-09 11:41:56 +01:00
Matthew Hodgson
e75148e799
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:20:10 +01:00
Matthew Hodgson
904348e62a
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:12:52 +01:00
Matthew Hodgson
dce2dd36ec
Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat
...
Wmwragg/one to one chat
2016-09-09 10:46:11 +01:00
Matthew Hodgson
8376f0d75a
Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat
...
Wmwragg/one to one chat
2016-09-09 10:46:01 +01:00
