f299572dc7
Merge pull request #2113 from vector-im/matthew/notif-panel
Matthew Hodgson
2016-09-12 15:57:51 +01:00
3fc657bce4
Merge pull request #450 from matrix-org/matthew/notif-panel
Matthew Hodgson
2016-09-12 15:57:13 +01:00
e28a3f10a0
Don't allow someone who is already on the invite list to appear in the AddressSelector
wmwragg
2016-09-12 15:48:32 +01:00
4836025a1d
First pass at adding multiple addresses, can only add from AddressSelector at the moment
wmwragg
2016-09-12 15:21:17 +01:00
5acdb8233b
The dismiss function now correctly deletes the dismissed element. Also the query render, will now render all invitees
wmwragg
2016-09-12 15:04:32 +01:00
d538377b82
Added an inviteList state to hold all the users to invite, but currently pretend it only has one users (the first one)
wmwragg
2016-09-12 14:48:00 +01:00
7d58968ea6
Correctly positioning the selected element if list shrinks in size
wmwragg
2016-09-12 14:07:51 +01:00
d65b791b2b
bump draft-js to 0.8.1 (as with matrix-react-sdk)
Aviral Dasgupta
2016-09-12 18:31:22 +05:30
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
wmwragg
2016-09-12 13:01:08 +01:00
28dcbb2a78
Refactored the queryList into seperate AddressSelector component
wmwragg
2016-09-12 13:00:44 +01:00
5775552bab
css for e2e look & feel
Matthew Hodgson
2016-09-12 01:38:03 +01:00
3a1159ce12
e2e look & feel
Matthew Hodgson
2016-09-12 01:37:51 +01:00
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
Matthew Hodgson
2016-09-11 23:01:28 +01:00
e6b4b8c1cb
bring back small avatars for info msgs otherwise the design breaks
Matthew Hodgson
2016-09-11 23:01:20 +01:00
8db2a4d46f
Fix linkification and bump linkifyjs dep
Aviral Dasgupta
2016-09-12 03:30:00 +05:30
46205ad83c
back out small avatars for emotes for now as they conflict with the E2E artwork. they will be reintroduced once we have lozenges
Matthew Hodgson
2016-09-11 22:49:05 +01:00
64dedef2c7
fix wordwrap on new panels
Matthew Hodgson
2016-09-11 21:55:57 +01:00
83209197f4
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-11 02:38:16 +01:00
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-11 02:37:30 +01:00
3a8c94de5a
CSS for notif & file panel
Matthew Hodgson
2016-09-11 02:15:03 +01:00
dd39813cc2
show context menus on hoverover
Matthew Hodgson
2016-09-11 02:14:52 +01:00
34bb37aaba
layout for file & notif panel
Matthew Hodgson
2016-09-11 02:14:27 +01:00
bae6409edb
show badge menu on RoomTile hoverover
Matthew Hodgson
2016-09-11 00:30:43 +01:00
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
Matthew Hodgson
2016-09-10 10:46:30 +01:00
6f270fd621
remove debug
Matthew Hodgson
2016-09-10 01:39:19 +01:00
e6c4273404
Merge pull request #2151 from vector-im/dbkr/memberinfo_createroom_cursor_pointer
Matthew Hodgson
2016-09-09 22:33:37 +01:00
86da0e0d63
Merge pull request #459 from VShell/fix-cas
Matthew Hodgson
2016-09-09 21:19:19 +01:00
1380bf705a
Fix CAS support by using a temporary Matrix client
Shell Turner
2016-09-09 18:21:31 +01:00
96fabe09d2
Update createRoom to support creating DM rooms
David Baker
2016-09-09 19:25:00 +01:00
e1c32536ff
Cursor: pointer on member info create room button
David Baker
2016-09-09 19:23:12 +01:00
8160613e01
Merge pull request #457 from matrix-org/dbkr/dont_crash_if_no_dm_rooms
Matthew Hodgson
2016-09-09 18:09:40 +01:00
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
David Baker
2016-09-09 17:38:13 +01:00
f1ed750246
Don't crash if no DM rooms with someone
David Baker
2016-09-09 17:35:35 +01:00
9cff4d59ca
Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section
David Baker
2016-09-09 17:35:02 +01:00
013f68519e
Merge pull request #2147 from vector-im/dbkr/memberinfo_list_rooms
David Baker
2016-09-09 17:30:35 +01:00
78f53bd403
Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms
David Baker
2016-09-09 17:30:32 +01:00
4c5db7cc9f
Don't always show DM rooms in Direct Messages
David Baker
2016-09-09 17:23:15 +01:00
fed3f48297
Merge pull request #452 from aviraldg/test-rte
Matthew Hodgson
2016-09-09 17:16:04 +01:00
6f2e0a4cdf
Make rooms in MemberInfo update when necessary
David Baker
2016-09-09 16:59:59 +01:00
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
David Baker
2016-09-09 16:27:00 +01:00
590d6d3ee8
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
David Baker
2016-09-09 16:22:48 +01:00
57804f4e02
Support for common rooms in MemberInfo
David Baker
2016-09-09 16:15:45 +01:00
aa0f15c46e
List common rooms in MemberInfo
David Baker
2016-09-09 16:15:01 +01:00
9c290c4b8d
Return after sending an error
Kegan Dougal
2016-09-09 16:14:41 +01:00
a306a5e694
Fix bug whereby refreshing Vector would not allow querying of membership state
Kegan Dougal
2016-09-09 16:06:19 +01:00
4de0e19ef3
Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators
Matthew Hodgson
2016-09-09 15:08:48 +01:00
c4421f6bc7
Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators
Matthew Hodgson
2016-09-09 15:08:20 +01:00
a6b0a7d5dc
Should supply the roomId
wmwragg
2016-09-09 15:01:40 +01:00
965d9aaf47
Lowered the Avatar menu background, so the Direct Message indicator is in front of it
wmwragg
2016-09-09 14:56:20 +01:00
2476f87e1d
Positional tweaks for the new Direct Message indicator
wmwragg
2016-09-09 14:47:26 +01:00
cd36800426
New direct message indicator CSS
wmwragg
2016-09-09 14:42:11 +01:00
17b75a589f
Added the little green men for direct message rooms
wmwragg
2016-09-09 14:36:51 +01:00
18eb9d9330
Made sure the z-index was correct for the new little green men
wmwragg
2016-09-09 14:36:21 +01:00
17e763e8e6
Merge pull request #451 from matrix-org/rav/deviceinfo
Richard van der Hoff
2016-09-09 14:08:42 +01:00
7e379e9877
Merge pull request #2136 from vector-im/wmwragg/room-directory-back
Matthew Hodgson
2016-09-09 14:08:19 +01:00
f2ca249b44
Merge pull request #2134 from vector-im/wmwragg/chat-invite-dialog-fix
Matthew Hodgson
2016-09-09 14:08:09 +01:00
fec1e4d4c1
Add some tests for the rich text editor
Aviral Dasgupta
2016-09-09 18:07:42 +05:30
09ce3a79ec
Added back the Directory listing button, with new tootlip
wmwragg
2016-09-09 12:23:50 +01:00
bfa59c6c04
Increased the width of the query list container to take account of scrollbars
wmwragg
2016-09-09 11:42:57 +01:00
b724b0c6b6
Update MemberDeviceInfo display
Richard van der Hoff
2016-09-09 11:41:56 +01:00
e75148e799
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-09 11:20:10 +01:00
904348e62a
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-09 11:12:52 +01:00
dce2dd36ec
Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat
Matthew Hodgson
2016-09-09 10:46:11 +01:00
8376f0d75a
Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat
Matthew Hodgson
2016-09-09 10:46:01 +01:00
bf02a21c7d
Re-add icons-people (I accidentally deleted it)
David Baker
2016-09-09 10:30:17 +01:00
6ddc31fb66
Merge pull request #443 from matrix-org/luke/post-messages
Luke Barnard
2016-09-09 09:57:48 +01:00
ac365622b8
Align the RoomTile tooltips with the BottomLeftMenu tooltips
wmwragg
2016-09-09 07:10:12 +01:00
840bfe84c1
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
wmwragg
2016-09-09 06:57:30 +01:00
7cb48e0d2d
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
wmwragg
2016-09-09 06:56:54 +01:00
db61d8e8ad
another null check
Matthew Hodgson
2016-09-09 02:28:14 +01:00
f4d939da81
null checks on room in onRoomTimeline
Matthew Hodgson
2016-09-09 02:09:12 +01:00
4aef352a5c
update to use new API based on js-sdk PR input
Matthew Hodgson
2016-09-08 22:48:44 +01:00
f605b172a7
Better log
Luke Barnard
2016-09-08 17:38:51 +01:00
38ac520e1e
Fixed name vertical overflow
wmwragg
2016-09-08 17:19:59 +01:00
6182ce48c9
fix (c)
Matthew Hodgson
2016-09-08 15:27:55 +01:00
3c7864a7ad
remove unused _gatherTimelinePanelRef
Matthew Hodgson
2016-09-08 14:52:08 +01:00
f88ba9df11
fix comment & use room.getUnfilteredTimelineSet()
Matthew Hodgson
2016-09-08 14:38:34 +01:00
9e771ddd07
Merge pull request #2111 from vector-im/dbkr/toggle_dm_room
David Baker
2016-09-08 14:11:30 +01:00
c9475e2ae5
Merge pull request #449 from matrix-org/dbkr/toggle_dm_room
David Baker
2016-09-08 14:11:22 +01:00
74aef1fdad
Comment delay
David Baker
2016-09-08 13:58:53 +01:00
ee7c064690
I can't spell 'likely'
David Baker
2016-09-08 13:56:45 +01:00
8860c9c7fd
Merge pull request #2082 from aviraldg/feature-rte-formatbar
Matthew Hodgson
2016-09-08 13:54:39 +01:00
b0a4b017c3
Merge pull request #440 from aviraldg/feature-rte-formatbar
Matthew Hodgson
2016-09-08 13:54:26 +01:00
d1974a75fd
Only Direct Message rooms, that aren't parted or forgotten are used
wmwragg
2016-09-08 13:09:54 +01:00
d0523cae70
If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one
wmwragg
2016-09-08 11:45:09 +01:00
Matthew Hodgson