Merge remote-tracking branch 'origin/develop' into develop

festivaledu · Mar 12, 2019 · 00f1f04 · 00f1f04
2 parents 84e8580 + 6d35358
commit 00f1f04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/NeoChannelPage.vue b/src/components/NeoChannelPage.vue
@@ -81,6 +81,9 @@
 			span {
 				display: block;
 				line-height: 22px;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 
 			.text-label {

diff --git a/src/components/NeoPrivateMessagesPage.vue b/src/components/NeoPrivateMessagesPage.vue
@@ -161,8 +161,6 @@ export default {
 			return other;
 		},
 		getLatestConversationMessage(conversation) {
-            console.log(conversation);
-
             if (conversation.channel.messages.length == 0) {
                 return "Keine Nachrichten";
             }