Matthew Hodgson
|
4de0e19ef3
|
Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators
Wmwragg/one to one indicators
|
2016-09-09 15:08:48 +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
|
a6b0a7d5dc
|
Should supply the roomId
|
2016-09-09 15:01:40 +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
|
17b75a589f
|
Added the little green men for direct message rooms
|
2016-09-09 14:36:51 +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 |
|
Richard van der Hoff
|
17e763e8e6
|
Merge pull request #451 from matrix-org/rav/deviceinfo
Update MemberDeviceInfo display
|
2016-09-09 14:08:42 +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 |
|
Aviral Dasgupta
|
fec1e4d4c1
|
Add some tests for the rich text editor
|
2016-09-09 18:07:42 +05:30 |
|
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 |
|
Richard van der Hoff
|
b724b0c6b6
|
Update MemberDeviceInfo display
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
|
2016-09-09 11:41:56 +01:00 |
|
Matthew Hodgson
|
e75148e799
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-09 11:20:10 +01:00 |
|
Matthew Hodgson
|
904348e62a
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-09 11:12:52 +01:00 |
|
Matthew Hodgson
|
dce2dd36ec
|
Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat
Wmwragg/one to one chat
|
2016-09-09 10:46:11 +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 |
|
Luke Barnard
|
6ddc31fb66
|
Merge pull request #443 from matrix-org/luke/post-messages
Scalar Messaging: Expose join_rules and restrict to currently viewed room
|
2016-09-09 09:57:48 +01:00 |
|
wmwragg
|
ac365622b8
|
Align the RoomTile tooltips with the BottomLeftMenu tooltips
|
2016-09-09 07:10:12 +01:00 |
|
wmwragg
|
840bfe84c1
|
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
|
2016-09-09 06:57:30 +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 |
|
Matthew Hodgson
|
db61d8e8ad
|
another null check
|
2016-09-09 02:28:14 +01:00 |
|
Matthew Hodgson
|
f4d939da81
|
null checks on room in onRoomTimeline
|
2016-09-09 02:09:12 +01:00 |
|
Matthew Hodgson
|
4aef352a5c
|
update to use new API based on js-sdk PR input
|
2016-09-08 22:48:44 +01:00 |
|
Luke Barnard
|
f605b172a7
|
Better log
|
2016-09-08 17:38:51 +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 |
|
Matthew Hodgson
|
3c7864a7ad
|
remove unused _gatherTimelinePanelRef
|
2016-09-08 14:52:08 +01:00 |
|
Matthew Hodgson
|
f88ba9df11
|
fix comment & use room.getUnfilteredTimelineSet()
|
2016-09-08 14:38:34 +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
|
c9475e2ae5
|
Merge pull request #449 from matrix-org/dbkr/toggle_dm_room
API for (un)marking rooms as DM rooms
|
2016-09-08 14:11:22 +01:00 |
|
David Baker
|
74aef1fdad
|
Comment delay
|
2016-09-08 13:58:53 +01:00 |
|
David Baker
|
ee7c064690
|
I can't spell 'likely'
|
2016-09-08 13:56:45 +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
|
b0a4b017c3
|
Merge pull request #440 from aviraldg/feature-rte-formatbar
Formatting toolbar for RTE message composer.
|
2016-09-08 13:54:26 +01:00 |
|
wmwragg
|
d1974a75fd
|
Only Direct Message rooms, that aren't parted or forgotten are used
|
2016-09-08 13:09:54 +01:00 |
|
wmwragg
|
d0523cae70
|
If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one
|
2016-09-08 11:45:09 +01:00 |
|
Aviral Dasgupta
|
8da7b98ad0
|
RTE: Remove dead code, fix <del> styling
|
2016-09-08 11:21:39 +05:30 |
|
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 |
|
Matthew Hodgson
|
c882d66b0d
|
make NotificationPanel work
|
2016-09-08 03:02:31 +01:00 |
|
Matthew Hodgson
|
27b3f5f6b1
|
create a global notif timeline set for each client
|
2016-09-08 03:02:26 +01:00 |
|
Matthew Hodgson
|
7174648f94
|
don't show RRs if manageRRs is false
|
2016-09-08 03:01:38 +01:00 |
|
Matthew Hodgson
|
334564c814
|
unbreak tests
|
2016-09-07 22:54:38 +01:00 |
|
Matthew Hodgson
|
8f75bce29e
|
add fixmes
|
2016-09-07 22:54:37 +01:00 |
|
Matthew Hodgson
|
990d84df77
|
make FilePanel refresh when we switch rooms
|
2016-09-07 22:54:37 +01:00 |
|
Matthew Hodgson
|
e7074ef9af
|
apply FilePanel css and fix filtering
|
2016-09-07 22:54:37 +01:00 |
|