89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +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
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +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
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
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
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +01:00
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +01:00
7c74b0124b
explicit props for RightPanel at last
2016-09-07 15:43:29 +01:00
1f19ee88c6
make FilePanel work, superficially at least
2016-09-06 01:45:12 +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
059f5198e5
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:07:21 +01:00
fb103cb9e1
Rename the action to make it clearer what it is doing
2016-09-05 10:27:54 +01:00
2d827a75a6
Sending the top and left position tweaks with the action
2016-09-04 12:16:01 +01:00
50bb4edd1c
Small refactor, to make it clearer whats happening
2016-09-04 08:54:15 +01:00
e52f5b5d08
Removed unrequired positional tweak props
2016-09-04 08:49:43 +01:00
fd81ce126b
Code tidy up
2016-09-04 08:40:43 +01:00
7ae821e2b5
Removed nolonger needed conditional test, as the parent will always exist
2016-09-04 08:39:32 +01:00
cb98e2421e
Removed the nolonger required methods
2016-09-04 07:56:32 +01:00
5417385c83
Tolltip thweak to not require the passing in of the parent
2016-09-04 07:41:48 +01:00
52bd61a2f0
When collapsed a long hover on the header now shows the full tag name and room count
2016-09-03 14:48:10 +01:00
7f52fa74a4
Better comments, and syntax tweak
2016-09-03 14:14:11 +01:00
d1dd4bd3d8
Updated tooltip styling to be better inline with the design
2016-09-03 13:57:49 +01:00
ab9f48cd47
Restyled tooltip to better match the design
2016-09-03 13:44:00 +01:00
c597f05e71
Merge branch 'develop' into matthew/notif-panel
2016-09-03 13:33:37 +01:00
80e6cd6d7c
Further tweaks to the tooltip to better handle its position, and simplify it's use
2016-09-03 12:44:09 +01:00
cb101b0a3b
Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover
2016-09-02 18:50:47 +01:00
bf4e3364b4
Tweak of the RoomTooltip to use DOM element for the parent rather than a React component
2016-09-02 18:41:27 +01:00
d2e2c726eb
Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari
2016-09-02 15:45:43 +01:00
bf8d7050cc
New People icon in place of Directory icon, and placeholder functionality
2016-09-01 16:46:51 +01:00
e85674711c
Improve readability of the changelog dialog
2016-09-01 15:13:09 +03:00
56dfdbeb6b
call noisy notifs... noisy
2016-09-01 00:14:01 +01:00
eaf47ea05c
show ongoing audio call in LeftPanel
2016-09-01 00:13:49 +01:00
9d72a7cb35
get adding FilePanel
2016-08-31 11:57:45 +01:00
a047f81b84
Merge branch 'develop' into matthew/notif-panel
2016-08-30 23:39:00 +01:00
b91a0dd7a5
Increased truncation limit to 10
2016-08-30 12:14:32 +01:00
45a813b795
Fixed historical scetion not scrolling up when clicked if not hidden and stuck
2016-08-30 11:56:16 +01:00
7b7a77bad0
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-30 11:22:31 +01:00
ff3ad47be7
Code clean up, and better comments, along with z-index fixes for scrollbar and avatar menu
2016-08-30 10:45:59 +01:00
f2e8607433
Over scroll of bottom sticky headers should be fixed, and expansion of hidden stuck headers should now work
2016-08-28 19:14:54 +01:00
b96ab58eb3
merge develop
2016-08-28 18:49:49 +01:00
36a608952d
make /user URLs work
2016-08-28 14:04:25 +01:00
8d4268754e
Fixed the stickies notification count to limit it to 99+
2016-08-28 12:03:05 +01:00
9b8e127e23
switch to using matrix.to for permalinks
2016-08-28 02:11:57 +01:00
ee1fae8ced
fix RoomTagContextMenu so it works on historical rooms
2016-08-27 23:58:35 +01:00
Matthew Hodgson