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
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
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +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
fb103cb9e1
Rename the action to make it clearer what it is doing
2016-09-05 10:27:54 +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
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
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
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
be9aa44ca8
fix NPE checking tag order
2016-08-26 23:49:07 +01:00
7ad3f4a577
Better comments
2016-08-26 15:53:31 +01:00
5b9d3b119f
Click on stuck header scrolls to that header, collapses expands for none stuck header
2016-08-26 15:08:47 +01:00
5467fd89d8
Getting click to not collapse expand when header stuck
2016-08-26 14:35:40 +01:00
a0236a9b76
Code tidy-up and better name for label container class
2016-08-26 09:57:02 +01:00
4cb1f8a226
Initial pass at sticky headers for the LHS panel section labels
2016-08-25 19:46:15 +01:00
f888ec6e81
notification panel WIP
2016-08-23 14:27:58 +01:00
d2e8201d79
Making sure that the sub list count always stays up to date, including when people read the outstanding notifications
2016-08-23 13:24:02 +01:00
2cf2df20f6
Added updating of count when room tile notification state changed
2016-08-23 12:40:15 +01:00
ee73bc3aa4
Refactor of the badge logic, and also added no badges when zero notifications
2016-08-23 11:35:03 +01:00
d3fa680373
Added all the notification states to the sub list count logic
2016-08-23 11:14:45 +01:00
a980864886
Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list
2016-08-23 10:47:17 +01:00
ca4d506391
Header wording for capped truncation count updated
2016-08-22 22:47:00 +01:00
4d5e3bc22b
Initial tag section header badge
2016-08-22 17:25:43 +01:00
ff55a951c9
Number of rooms added to header of sections
2016-08-22 17:02:52 +01:00
895172d498
Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on
2016-08-22 16:42:08 +01:00
71f73d8df2
Collapsing and truncation initial state and onClick event logic
2016-08-22 15:50:36 +01:00
97daca4b31
Initial restyle of the sub lists and room lists
2016-08-22 14:10:06 +01:00
d65477891e
Merge pull request #1941 from vector-im/wmwragg/room-tag-menu
...
Wmwragg/room tag menu
2016-08-11 09:00:48 -05:00
699a58e0b3
Fix for historic and new undefined order issues
2016-08-10 11:39:10 +01:00
1c812b340d
Initial pass at handling room tags that don't have an order element, but need one manual ordering
2016-08-09 19:20:27 +01:00
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +01:00
Matthew Hodgson