695930efa5
e2e icons
2016-09-12 16:50:53 +01:00
937e195157
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
2016-09-12 16:44:44 +01:00
7f2c74e7a8
Merge branch 'develop' into matthew/e2e
2016-09-12 16:32:58 +01:00
fb639da128
Merge branch 'develop' into matthew/e2e
2016-09-12 16:32:39 +01:00
90fea6c389
unbreak video thumbs
2016-09-12 16:28:56 +01:00
8e7b1820b9
unbreak video thumbs
2016-09-12 16:28:39 +01:00
6ffa7c23cd
Don't re-use parted rooms for DMs
2016-09-12 16:05:51 +01:00
f299572dc7
Merge pull request #2113 from vector-im/matthew/notif-panel
...
FilePanel and NotificationPanel support
2016-09-12 15:57:51 +01:00
3fc657bce4
Merge pull request #450 from matrix-org/matthew/notif-panel
...
FilePanel, NotificationPanel and EventTimelineSet support
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
2016-09-12 15:48:32 +01:00
4836025a1d
First pass at adding multiple addresses, can only add from AddressSelector at the moment
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
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)
2016-09-12 14:48:00 +01:00
7d58968ea6
Correctly positioning the selected element if list shrinks in size
2016-09-12 14:07:51 +01:00
d65b791b2b
bump draft-js to 0.8.1 (as with matrix-react-sdk)
2016-09-12 18:31:22 +05:30
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:01:08 +01:00
28dcbb2a78
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:00:44 +01:00
5775552bab
css for e2e look & feel
2016-09-12 01:38:03 +01:00
3a1159ce12
e2e look & feel
2016-09-12 01:37:51 +01:00
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:28 +01:00
e6b4b8c1cb
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:20 +01:00
8db2a4d46f
Fix linkification and bump linkifyjs dep
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
2016-09-11 22:49:05 +01:00
64dedef2c7
fix wordwrap on new panels
2016-09-11 21:55:57 +01:00
83209197f4
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:38:16 +01:00
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +01:00
3a8c94de5a
CSS for notif & file panel
2016-09-11 02:15:03 +01:00
dd39813cc2
show context menus on hoverover
2016-09-11 02:14:52 +01:00
34bb37aaba
layout for file & notif panel
2016-09-11 02:14:27 +01:00
bae6409edb
show badge menu on RoomTile hoverover
2016-09-11 00:30:43 +01:00
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
2016-09-10 10:46:30 +01:00
6f270fd621
remove debug
2016-09-10 01:39:19 +01:00
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
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
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
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
e1c32536ff
Cursor: pointer on member info create room button
2016-09-09 19:23:12 +01:00
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
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
2016-09-09 17:38:13 +01:00
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
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
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
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
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
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
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
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +01:00
590d6d3ee8
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:22:48 +01:00
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
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
Matthew Hodgson
David Baker
Matthew Hodgson
wmwragg
Aviral Dasgupta
Shell Turner
David Baker
Kegsay