From 5a77f89f60ddae21a6f0147cd76e5d9386e1db23 Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Mon, 25 Jan 2016 11:13:51 -0200 Subject: [PATCH 1/2] Temporary fix for AM/PM timestamp breaking cog --- packages/rocketchat-livechat/app/client/views/message.coffee | 2 +- packages/rocketchat-ui-message/message/message.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-livechat/app/client/views/message.coffee b/packages/rocketchat-livechat/app/client/views/message.coffee index 87cc3d9164e9..45fd4aa745bf 100644 --- a/packages/rocketchat-livechat/app/client/views/message.coffee +++ b/packages/rocketchat-livechat/app/client/views/message.coffee @@ -4,7 +4,7 @@ Template.message.helpers return 'own' if this.u?._id is Meteor.userId() time: -> - return moment(this.ts).format('LT') + return moment(this.ts).format('LT').replace(/(AM|PM)$/i, '') date: -> return moment(this.ts).format('LL') diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee index 6295dd6b9578..ddaea0512097 100644 --- a/packages/rocketchat-ui-message/message/message.coffee +++ b/packages/rocketchat-ui-message/message/message.coffee @@ -14,7 +14,7 @@ Template.message.helpers chatops: -> return 'chatops-message' if this.u?.username is RocketChat.settings.get('Chatops_Username') time: -> - return moment(this.ts).format('LT') + return moment(this.ts).format('LT').replace(/(AM|PM)$/i, '') date: -> return moment(this.ts).format('LL') isTemp: -> From 01dd59b67d86db368a2c106c45c67f855b53821b Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Mon, 25 Jan 2016 11:49:09 -0200 Subject: [PATCH 2/2] Temporary fix for AM/PM timestamp breaking cog --- packages/rocketchat-livechat/app/client/views/message.coffee | 2 +- packages/rocketchat-theme/assets/stylesheets/base.less | 2 +- packages/rocketchat-ui-message/message/message.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-livechat/app/client/views/message.coffee b/packages/rocketchat-livechat/app/client/views/message.coffee index 45fd4aa745bf..87cc3d9164e9 100644 --- a/packages/rocketchat-livechat/app/client/views/message.coffee +++ b/packages/rocketchat-livechat/app/client/views/message.coffee @@ -4,7 +4,7 @@ Template.message.helpers return 'own' if this.u?._id is Meteor.userId() time: -> - return moment(this.ts).format('LT').replace(/(AM|PM)$/i, '') + return moment(this.ts).format('LT') date: -> return moment(this.ts).format('LL') diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index cd4541029362..ee4c1853c5e4 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -2742,7 +2742,7 @@ a.github-fork { &:hover { .time { - display: inline-block; + // display: inline-block; } .edited { display: none; diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee index ddaea0512097..6295dd6b9578 100644 --- a/packages/rocketchat-ui-message/message/message.coffee +++ b/packages/rocketchat-ui-message/message/message.coffee @@ -14,7 +14,7 @@ Template.message.helpers chatops: -> return 'chatops-message' if this.u?.username is RocketChat.settings.get('Chatops_Username') time: -> - return moment(this.ts).format('LT').replace(/(AM|PM)$/i, '') + return moment(this.ts).format('LT') date: -> return moment(this.ts).format('LL') isTemp: ->