Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
e3dc8870
Unverified
Commit
e3dc8870
authored
6 years ago
by
Eugen Rochko
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove visible timestamps for notifications (#9675)
Revert #9423. Issues with line breaks / clutter.
parent
8f5fdab5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/javascript/mastodon/features/notifications/components/notification.js
+8
-10
8 additions, 10 deletions
...astodon/features/notifications/components/notification.js
with
8 additions
and
10 deletions
app/javascript/mastodon/features/notifications/components/notification.js
+
8
−
10
View file @
e3dc8870
...
...
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
StatusContainer
from
'
../../../containers/status_container
'
;
import
AccountContainer
from
'
../../../containers/account_container
'
;
import
RelativeTimestamp
from
'
../../../components/relative_timestamp
'
;
import
{
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
Permalink
from
'
../../../components/permalink
'
;
import
ImmutablePureComponent
from
'
react-immutable-pure-component
'
;
...
...
@@ -86,13 +85,12 @@ class Notification extends ImmutablePureComponent {
<
div
className
=
'
notification__favourite-icon-wrapper
'
>
<
i
className
=
'
fa fa-fw fa-user-plus
'
/>
<
/div
>
<
span
title
=
{
notification
.
get
(
'
created_at
'
)}
>
<
FormattedMessage
id
=
'
notification.follow
'
defaultMessage
=
'
{name} followed you
'
values
=
{{
name
:
link
}}
/
>
<
span
className
=
'
notification__relative_time
'
>
<
RelativeTimestamp
timestamp
=
{
notification
.
get
(
'
created_at
'
)}
/
>
<
/span
>
<
/span
>
<
/div
>
<
AccountContainer
id
=
{
account
.
get
(
'
id
'
)}
withNote
=
{
false
}
hidden
=
{
this
.
props
.
hidden
}
/
>
<
/div
>
<
/HotKeys
>
...
...
@@ -122,9 +120,9 @@ class Notification extends ImmutablePureComponent {
<
div
className
=
'
notification__favourite-icon-wrapper
'
>
<
i
className
=
'
fa fa-fw fa-star star-icon
'
/>
<
/div
>
<
FormattedMessage
id
=
'
notification.favourite
'
defaultMessage
=
'
{name} favourited your status
'
values
=
{{
name
:
link
}}
/
>
<
span
classNam
e
=
'
notification
__
re
l
at
ive_time
'
>
<
RelativeTimestamp
className
=
'
notification__relative_time
'
timestamp
=
{
notification
.
get
(
'
created_at
'
)
}
/
>
<
span
titl
e
=
{
notification
.
get
(
'
c
reat
ed_at
'
)}
>
<
FormattedMessage
id
=
'
notification.favourite
'
defaultMessage
=
'
{name} favourited your status
'
values
=
{{
name
:
link
}
}
/
>
<
/span
>
<
/div
>
...
...
@@ -144,9 +142,9 @@ class Notification extends ImmutablePureComponent {
<
div
className
=
'
notification__favourite-icon-wrapper
'
>
<
i
className
=
'
fa fa-fw fa-retweet
'
/>
<
/div
>
<
FormattedMessage
id
=
'
notification.reblog
'
defaultMessage
=
'
{name} boosted your status
'
values
=
{{
name
:
link
}}
/
>
<
span
classNam
e
=
'
notification
__
re
l
at
ive_time
'
>
<
RelativeTimestamp
className
=
'
notification__relative_time
'
timestamp
=
{
notification
.
get
(
'
created_at
'
)
}
/
>
<
span
titl
e
=
{
notification
.
get
(
'
c
reat
ed_at
'
)}
>
<
FormattedMessage
id
=
'
notification.reblog
'
defaultMessage
=
'
{name} boosted your status
'
values
=
{{
name
:
link
}
}
/
>
<
/span
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment