1530568354
Merge branch 'develop' into wmwragg/chat-multi-invite
2016-09-13 12:38:45 +01:00
f59dbe40ec
Added error checking, and UI
2016-09-13 11:03:27 +01:00
562c3b0e04
fix notif icon
2016-09-13 10:32:40 +01:00
f119a57952
dedicated dialog box for E2E messages
2016-09-12 23:42:43 +01:00
c6fa1e2e21
show e2e icon by default
2016-09-12 20:02:22 +01:00
0bdc026b05
E2E CSS
2016-09-12 18:50:32 +01:00
20eb28f052
fix e2e icon placement
2016-09-12 17:38:27 +01:00
bfd3ef0e44
Limit the invite area in height
2016-09-12 17:31:49 +01:00
abda8c77ad
Added styling for unknown addresses
2016-09-12 17:25:38 +01:00
9e5d090ddb
Merge pull request #2163 from vector-im/matthew/e2e
...
First wave of E2E visuals
2016-09-12 17:20:23 +01:00
906be376c9
Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId
2016-09-12 16:51:42 +01:00
695930efa5
e2e icons
2016-09-12 16:50:53 +01:00
7f2c74e7a8
Merge branch 'develop' into matthew/e2e
2016-09-12 16:32:58 +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
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:01:08 +01:00
5775552bab
css for e2e look & feel
2016-09-12 01:38:03 +01:00
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:28 +01:00
64dedef2c7
fix wordwrap on new panels
2016-09-11 21:55:57 +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
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
e1c32536ff
Cursor: pointer on member info create room button
2016-09-09 19:23:12 +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
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +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
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
965d9aaf47
Lowered the Avatar menu background, so the Direct Message indicator is in front of it
2016-09-09 14:56:20 +01:00
2476f87e1d
Positional tweaks for the new Direct Message indicator
2016-09-09 14:47:26 +01:00
cd36800426
New direct message indicator CSS
2016-09-09 14:42:11 +01:00
18eb9d9330
Made sure the z-index was correct for the new little green men
2016-09-09 14:36:21 +01:00
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
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
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +01:00
bfa59c6c04
Increased the width of the query list container to take account of scrollbars
2016-09-09 11:42:57 +01:00
e75148e799
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:20:10 +01:00
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
bf02a21c7d
Re-add icons-people (I accidentally deleted it)
2016-09-09 10:30:17 +01:00
ac365622b8
Align the RoomTile tooltips with the BottomLeftMenu tooltips
2016-09-09 07:10:12 +01:00
7cb48e0d2d
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
2016-09-09 06:56:54 +01:00
38ac520e1e
Fixed name vertical overflow
2016-09-08 17:19:59 +01:00
6182ce48c9
fix (c)
2016-09-08 15:27:55 +01:00
9e771ddd07
Merge pull request #2111 from vector-im/dbkr/toggle_dm_room
...
Support toggling DM status of rooms
2016-09-08 14:11:30 +01:00
74aef1fdad
Comment delay
2016-09-08 13:58:53 +01:00
8860c9c7fd
Merge pull request #2082 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:39 +01:00
a8d7d23dd6
implement NotifPanel css
2016-09-08 03:03:10 +01:00
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +01:00
d833c7632d
Add strikethrough and <hr> styles
2016-09-08 02:47:31 +05:30
22bf6e7969
RTE format bar enhancements
2016-09-07 22:52:37 +05:30
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +01:00
wmwragg