David Baker
a11516a984
Make publicrooms use the new paginating API
...
Also do filtering on the server
WIP: This breaks the network dropdown
2016-09-16 17:33:28 +01:00
David Baker
135c22c99d
Merge pull request #2219 from vector-im/dbkr/directory_network_selector
...
Directory network selector
2016-09-16 17:09:23 +01:00
wmwragg
7af765976b
Notification counts now done correctly, as well as highlights
2016-09-16 13:25:39 +01:00
wmwragg
72e108c4f9
More robust badge positioning
2016-09-16 11:34:16 +01:00
wmwragg
e2b695827e
Refactor to reuse RoomSubList chevron styling
2016-09-16 11:02:09 +01:00
wmwragg
4b50a8a56e
Refactored so the RoomSubList overflow element use RoomSubList CSS
2016-09-16 10:57:55 +01:00
wmwragg
737d1d8843
Changed the overflow tile styling, but there is no collpased state or mention count yet
2016-09-16 10:48:52 +01:00
David Baker
cd4564d3d3
Make the matrix.org section be everything
...
(ie. every alias on the matrix.org HS, so currently everything, since we don't pull in any other directories)
2016-09-15 18:56:04 +01:00
wmwragg
37fc73b1ea
Setting correct initial state
2016-09-15 17:31:15 +01:00
David Baker
c1e83da35d
Put network list config into config file
2016-09-15 17:20:13 +01:00
wmwragg
5282796d84
Added back the overflow tile and two state room sub lists, rather than the three state currently
2016-09-15 17:17:45 +01:00
Matthew Hodgson
866164c4d9
Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning
...
Wmwragg/correct incoming call positioning
2016-09-15 15:59:14 +01:00
wmwragg
5ceb1e641f
Placing the incomingCallBox in the sticky element, so it sticks when the header sticks
2016-09-15 15:34:11 +01:00
David Baker
f3cbb9fe90
Make the network dropdown work
2016-09-15 15:18:12 +01:00
wmwragg
cde3f33db3
Added incomingCallBox to header and removed from roomTile
2016-09-15 14:37:53 +01:00
Matthew Hodgson
82e257b4ea
make DM naming consistent
2016-09-15 13:23:17 +01:00
David Baker
43b87e1f82
Add network selector that doesn't do anything yet
2016-09-15 11:29:27 +01:00
wmwragg
efa574c452
The invite group, will no longer be shown when the directory listing is being shown
2016-09-14 17:13:06 +01:00
wmwragg
66ef5213b8
Increased hitbox area to the whole invite section, not just the icon
2016-09-14 14:32:30 +01:00
Matthew Hodgson
089951012b
actually, sod it, let's just call it Start chat
2016-09-13 19:42:35 +01:00
Matthew Hodgson
c6a9614372
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
...
Wmwragg/chat multi invite
2016-09-13 19:31:05 +01:00
Matthew Hodgson
b247c8a87f
rename 'start chat' tooltip
2016-09-13 19:08:43 +01:00
wmwragg
f8c9a28194
Updated to correct invite icon
2016-09-13 14:33:19 +01:00
wmwragg
768f11fe58
Added new Invite button in the RHS footer
2016-09-13 14:27:23 +01:00
Matthew Hodgson
7b25f4e069
wip for collapsable RHS
2016-09-13 12:18:09 +01:00
Matthew Hodgson
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +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
wmwragg
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +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
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
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
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +01:00
David Baker
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +01:00
Matthew Hodgson
7c74b0124b
explicit props for RightPanel at last
2016-09-07 15:43:29 +01:00
Matthew Hodgson
1f19ee88c6
make FilePanel work, superficially at least
2016-09-06 01:45:12 +01:00
Aviral Dasgupta
d6a324ede7
Formatting toggle, markdown indicator, quoting
2016-09-05 17:39:32 +05:30
wmwragg
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
wmwragg
059f5198e5
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:07:21 +01:00
wmwragg
fb103cb9e1
Rename the action to make it clearer what it is doing
2016-09-05 10:27:54 +01:00
wmwragg
2d827a75a6
Sending the top and left position tweaks with the action
2016-09-04 12:16:01 +01:00
wmwragg
50bb4edd1c
Small refactor, to make it clearer whats happening
2016-09-04 08:54:15 +01:00
wmwragg
e52f5b5d08
Removed unrequired positional tweak props
2016-09-04 08:49:43 +01:00
wmwragg
fd81ce126b
Code tidy up
2016-09-04 08:40:43 +01:00
wmwragg
7ae821e2b5
Removed nolonger needed conditional test, as the parent will always exist
2016-09-04 08:39:32 +01:00
wmwragg
cb98e2421e
Removed the nolonger required methods
2016-09-04 07:56:32 +01:00
wmwragg
5417385c83
Tolltip thweak to not require the passing in of the parent
2016-09-04 07:41:48 +01:00
