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
1d32dd72ed
Fixed typing error
2016-09-07 17:30:53 +01:00
a3b77475c7
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-07 17:23:43 +01:00
761552430c
Dialog buttons have a pointer cursor now
2016-09-07 17:14:27 +01:00
cc720b9797
Design tweaks for alignment
2016-09-07 17:08:24 +01:00
75c81b369f
Mouse actions on the queryList added, as well as better queryListElement styling
2016-09-07 16:19:30 +01:00
7c74b0124b
explicit props for RightPanel at last
2016-09-07 15:43:29 +01:00
48501d91d2
Added justification for the AddressTile, when requested
2016-09-07 10:55:31 +01:00
aefef2ba56
FilePanel css
2016-09-07 02:16:09 +01:00
31dd49ffd7
Bump to olm 1.2.0
2016-09-06 22:33:21 +01:00
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
c0ce7663a9
Initial highlighting selected address - styling not final
2016-09-06 16:39:38 +01:00
e3d5ca34c8
Circumventing autofill by using a textarea rather than an input type=text
2016-09-06 16:15:36 +01:00
1fb53565ef
Added scrolling to queryList
2016-09-06 15:46:09 +01:00
a41a8d32b8
Basic address list created, and UX tweaks for interaction
2016-09-06 15:24:37 +01:00
835d13c696
Another go at using latest Olm
...
The previous attempt failed due to npm shenanigans. Let's have another go,
without the "help" of npm.
2016-09-06 13:24:06 +01:00
6153e795bf
Correct AddressTile and ChatInviteDialog styling
2016-09-06 11:33:56 +01:00
d12498f418
right cursor for roomsettings colours
2016-09-06 11:29:50 +01:00
c0eb69963d
Merge pull request #2092 from vector-im/rav/use_development_olm
...
jenkins.sh: install olm from jenkins artifacts
2016-09-06 11:11:05 +01:00
1f19ee88c6
make FilePanel work, superficially at least
2016-09-06 01:45:12 +01:00
24351537d2
we have nothing to hide
2016-09-06 01:19:48 +01:00
d309a7a67b
jenkins.sh: install olm from jenkins artifacts
...
Use the latest version of olm, as provided by jenkins, rather than the most
recent release.
2016-09-05 18:54:10 +01:00
f6f68bc348
Initial AddressTile added
2016-09-05 17:28:23 +01:00
d6a324ede7
Formatting toggle, markdown indicator, quoting
2016-09-05 17:39:32 +05:30
7378904f00
Adding back the BottomLeftMenuTile component, as it turns out it's still used in the RightPanel
2016-09-05 12:43:04 +01:00
David Baker