Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Wmwragg/direct chat sublist #432

Merged
merged 25 commits into from
Aug 30, 2016
Merged

Wmwragg/direct chat sublist #432

merged 25 commits into from
Aug 30, 2016

Conversation

wmwragg
Copy link
Contributor

@wmwragg wmwragg commented Aug 30, 2016

A companion branch vector-im/vector-web:wmwragg/direct-chat-sublist also needs to be merged.

Signed-off-by: William Wragg [email protected]

wmwragg added 24 commits August 11, 2016 16:45
…fferent scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars
@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@@ -24,5 +25,34 @@ module.exports = {
getDisplayAliasForRoom: function(room) {
return room.getCanonicalAlias() || room.getAliases()[0];
},

isDirectMessageRoom: function(room, me, ConferenceHandler, hideConferenceChans) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads up that this function will change shortly once we've finally finally defined how to track which rooms are DMs in terms of room or user configuration state. This is fine for now though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, made it a separate function, as you mentioned this when I was doing it, so this should be easily swapped out for the new behaviour once it's implemented.

@ara4n
Copy link
Member

ara4n commented Aug 30, 2016

LGTM other than minor comments.

@ara4n
Copy link
Member

ara4n commented Aug 30, 2016

@matrixbot okay to test

@ara4n ara4n merged commit 7a2b7b5 into develop Aug 30, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants