Skip to content

Add a   after timestamp - #3046

Merged
dbkr merged 3 commits into
element-hq:developfrom
rubo77:patch-1
Jan 8, 2018
Merged

Add a   after timestamp#3046
dbkr merged 3 commits into
element-hq:developfrom
rubo77:patch-1

Conversation

@rubo77

@rubo77 rubo77 commented Jan 24, 2017

Copy link
Copy Markdown
Contributor

This solves part of the problem that the timestamp is gluing at the message, when copied in your clipboard.

Example:

23:02test message

see #893

Signed-off-by: Ruben Barkow github@r.z11.de

This solves part of the problem that the timestamp is  gluing at the message, when copied in your clipboard.

Example:

    23:02test message

see element-hq#893
@rubo77 rubo77 mentioned this pull request Jan 24, 2017
@ara4n

ara4n commented Mar 2, 2017

Copy link
Copy Markdown
Member

what browser does this problem occur on? i don't see the timestamp glued to the message when copying from chrome...

@rubo77

rubo77 commented Mar 2, 2017

Copy link
Copy Markdown
Contributor Author

Yes, in Chrome it seems fine, in Firefox it is glued.

@dbkr

dbkr commented Jan 5, 2018

Copy link
Copy Markdown
Member

Sorry again that this has got missed for almost a year. It's against the wrong branch though and you need to do the DCO signoff.

@rubo77

rubo77 commented Jan 5, 2018

Copy link
Copy Markdown
Contributor Author

Can't you please just cherry pick it from here?

@t3chguy

t3chguy commented Jan 5, 2018

Copy link
Copy Markdown
Member

@rubo77 you can change the branch at the top of the pull request, the more important bit is the DCO

@t3chguy
t3chguy changed the base branch from master to develop January 5, 2018 15:52
@rubo77
rubo77 changed the base branch from develop to master January 6, 2018 16:57
@rubo77

rubo77 commented Jan 6, 2018

Copy link
Copy Markdown
Contributor Author

I changed to master.

Hereby I sign the DCO

@t3chguy

t3chguy commented Jan 6, 2018

Copy link
Copy Markdown
Member

It should be on develop. Which is why I changed it to that...

@t3chguy

t3chguy commented Jan 6, 2018

Copy link
Copy Markdown
Member

@rubo77 please read the Contributing doc properly: https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off
and fix the Merge conflict

@t3chguy
t3chguy changed the base branch from master to develop January 6, 2018 17:04
@rubo77

rubo77 commented Jan 6, 2018

Copy link
Copy Markdown
Contributor Author

Sorry, I'm only on mobile until Monday

@rubo77

rubo77 commented Jan 6, 2018

Copy link
Copy Markdown
Contributor Author

Is the sign off on the first post correct?

return (
<span className="mx_MessageTimestamp">
{ DateUtils.formatTime(date)+'&nbsp;' }
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks like a bad merge @dbkr

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

oops, good spot

@t3chguy t3chguy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM merge-wise

@dbkr
dbkr merged commit a21bbd1 into element-hq:develop Jan 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants