OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,135 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

2135 Commits (9e5d090ddb26b7028e9ba555b271a2bd00ec90f0)

Author SHA1 Message Date
Matthew Hodgson 9e5d090ddb Merge pull request #2163 from vector-im/matthew/e2e 
First wave of E2E visuals
 2016-09-12 17:20:23 +01:00
Matthew Hodgson 695930efa5 e2e icons 2016-09-12 16:50:53 +01:00
Matthew Hodgson 7f2c74e7a8 Merge branch 'develop' into matthew/e2e 2016-09-12 16:32:58 +01:00
Matthew Hodgson f299572dc7 Merge pull request #2113 from vector-im/matthew/notif-panel 
FilePanel and NotificationPanel support
 2016-09-12 15:57:51 +01:00
Matthew Hodgson 5775552bab css for e2e look & feel 2016-09-12 01:38:03 +01:00
Matthew Hodgson dd4617a7c6 bring back small avatars for info msgs otherwise the design breaks 2016-09-11 23:01:28 +01:00
Matthew Hodgson 64dedef2c7 fix wordwrap on new panels 2016-09-11 21:55:57 +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 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
David Baker e1c32536ff Cursor: pointer on member info create room button 2016-09-09 19:23:12 +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 ab9786cc02 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms 2016-09-09 16:27:00 +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
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 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 18eb9d9330 Made sure the z-index was correct for the new little green men 2016-09-09 14:36:21 +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
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
Matthew Hodgson e75148e799 Merge branch 'develop' into matthew/notif-panel 2016-09-09 11:20:10 +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
David Baker bf02a21c7d Re-add icons-people (I accidentally deleted it) 2016-09-09 10:30:17 +01:00
wmwragg ac365622b8 Align the RoomTile tooltips with the BottomLeftMenu tooltips 2016-09-09 07:10:12 +01:00
wmwragg 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
wmwragg 38ac520e1e Fixed name vertical overflow 2016-09-08 17:19:59 +01:00
Matthew Hodgson 6182ce48c9 fix (c) 2016-09-08 15:27:55 +01:00
David Baker 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
David Baker 74aef1fdad Comment delay 2016-09-08 13:58:53 +01:00
Matthew Hodgson 8860c9c7fd Merge pull request #2082 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:39 +01:00
Matthew Hodgson a8d7d23dd6 implement NotifPanel css 2016-09-08 03:03:10 +01:00
Matthew Hodgson f5ce053f42 hook up the NotifPanel button 2016-09-08 03:02:50 +01:00
Aviral Dasgupta d833c7632d Add strikethrough and <hr> styles 2016-09-08 02:47:31 +05:30
Aviral Dasgupta 22bf6e7969 RTE format bar enhancements 2016-09-07 22:52:37 +05:30
David Baker a1f8116e3b Support toggling DM status of rooms 
on context menu
 2016-09-07 17:47:47 +01:00
wmwragg 1d32dd72ed Fixed typing error 2016-09-07 17:30:53 +01:00
wmwragg a3b77475c7 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-07 17:23:43 +01:00
wmwragg 761552430c Dialog buttons have a pointer cursor now 2016-09-07 17:14:27 +01:00
wmwragg cc720b9797 Design tweaks for alignment 2016-09-07 17:08:24 +01:00
wmwragg 75c81b369f Mouse actions on the queryList added, as well as better queryListElement styling 2016-09-07 16:19:30 +01:00
Matthew Hodgson 7c74b0124b explicit props for RightPanel at last 2016-09-07 15:43:29 +01:00
wmwragg 48501d91d2 Added justification for the AddressTile, when requested 2016-09-07 10:55:31 +01:00
Matthew Hodgson aefef2ba56 FilePanel css 2016-09-07 02:16:09 +01:00
Richard van der Hoff 31dd49ffd7 Bump to olm 1.2.0 2016-09-06 22:33:21 +01:00
wmwragg ace0e01d86 Tweak on the textarea to prevent the input area jumping a couple of pixels in size between textarea and AddressTile 2016-09-06 17:21:28 +01:00
wmwragg c0ce7663a9 Initial highlighting selected address - styling not final 2016-09-06 16:39:38 +01:00