Merge branch 'master' of github.com:designcreateplay/NodeBB

This commit is contained in:
Julian Lam
2013-10-19 17:48:00 -04:00
2 changed files with 3 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
{
"chat.chatting_with": "Chat with <span id='chat-with-name'></span>",
"chat.placeholder": "type chat message, here press enter to send",
"chat.placeholder": "type chat message here, press enter to send",
"chat.send": "Send",
"stats.online": "Online",
"stats.users": "Users",

View File

@@ -273,7 +273,7 @@ var socket,
}
$('span.timeago').timeago();
$('.post-content img').addClass('img-responsive');
setTimeout(function () {
window.scrollTo(0, 1); // rehide address bar on mobile after page load completes.
@@ -342,6 +342,7 @@ var socket,
app.populate_online_users();
app.addCommasToNumbers();
$('span.timeago').timeago();
$('.post-content img').addClass('img-responsive');
});
}