Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a   after timestamp #3046

Merged
merged 3 commits into from Jan 8, 2018

Conversation

@rubo77
Copy link
Contributor

rubo77 commented Jan 24, 2017

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 #893
@rubo77 rubo77 referenced this pull request Jan 24, 2017
@ara4n

This comment has been minimized.

Copy link
Member

ara4n commented Mar 2, 2017

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

@rubo77

This comment has been minimized.

Copy link
Contributor Author

rubo77 commented Mar 2, 2017

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

@dbkr

This comment has been minimized.

Copy link
Member

dbkr commented Jan 5, 2018

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

This comment has been minimized.

Copy link
Contributor Author

rubo77 commented Jan 5, 2018

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

@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Jan 5, 2018

@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 Jan 5, 2018
@rubo77 rubo77 changed the base branch from develop to master Jan 6, 2018
@rubo77

This comment has been minimized.

Copy link
Contributor Author

rubo77 commented Jan 6, 2018

I changed to master.

Hereby I sign the DCO

@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Jan 6, 2018

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

@t3chguy

This comment has been minimized.

Copy link
Collaborator

t3chguy commented Jan 6, 2018

@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 Jan 6, 2018
@rubo77

This comment has been minimized.

Copy link
Contributor Author

rubo77 commented Jan 6, 2018

Sorry, I'm only on mobile until Monday

@rubo77

This comment has been minimized.

Copy link
Contributor Author

rubo77 commented Jan 6, 2018

Is the sign off on the first post correct?

@@ -29,8 +29,10 @@ module.exports = React.createClass({
render: function() {
const date = new Date(this.props.ts);
return (
<span className="mx_MessageTimestamp">
{ DateUtils.formatTime(date)+'&nbsp;' }
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>

This comment has been minimized.

Copy link
@t3chguy

t3chguy Jan 8, 2018

Collaborator

Looks like a bad merge @dbkr

This comment has been minimized.

Copy link
@dbkr

dbkr Jan 8, 2018

Member

oops, good spot

@t3chguy
t3chguy approved these changes Jan 8, 2018
Copy link
Collaborator

t3chguy left a comment

LGTM merge-wise

@dbkr dbkr merged commit a21bbd1 into vector-im:develop Jan 8, 2018
1 check was pending
1 check was pending
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.