Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
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
Container Registry
Model registry
Operate
Environments
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
Matrix-Sasuke
pleroma-fe
Commits
1857d0fa
Commit
1857d0fa
authored
4 months ago
by
HJ
Browse files
Options
Downloads
Plain Diff
Merge branch 'absolute_time_format' into 'develop'
Absolute time format Closes
#1342
See merge request
!1952
parents
cec2ae2f
898881ba
Branches
feature/object-normalization
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#50859
passed
3 months ago
Stage: lint
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/weird-absolute-time-format.fix
+1
-0
1 addition, 0 deletions
changelog.d/weird-absolute-time-format.fix
src/components/timeago/timeago.vue
+1
-1
1 addition, 1 deletion
src/components/timeago/timeago.vue
src/modules/config.js
+1
-1
1 addition, 1 deletion
src/modules/config.js
with
3 additions
and
2 deletions
changelog.d/weird-absolute-time-format.fix
0 → 100644
+
1
−
0
View file @
1857d0fa
Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/components/timeago/timeago.vue
+
1
−
1
View file @
1857d0fa
...
...
@@ -61,7 +61,7 @@ export default {
})
}
else
if
(
DateUtils
.
isSameMonth
(
this
.
timeAsDate
,
now
))
{
return
new
Intl
.
DateTimeFormat
(
this
.
browserLocale
,
{
hour
:
'
numeric
'
,
month
:
'
short
'
,
day
:
'
numeric
'
})
}
else
if
(
DateUtils
.
isSameYear
(
this
.
timeAsDate
,
now
))
{
...
...
This diff is collapsed.
Click to expand it.
src/modules/config.js
+
1
−
1
View file @
1857d0fa
...
...
@@ -181,7 +181,7 @@ export const defaultState = {
closingDrawerMarksAsSeen
:
undefined
,
// instance default
unseenAtTop
:
undefined
,
// instance default
ignoreInactionableSeen
:
undefined
,
// instance default
useAbsoluteTimeFormat
:
undefined
,
// instance def
u
alt
useAbsoluteTimeFormat
:
undefined
,
// instance defa
u
lt
absoluteTimeFormatMinAge
:
undefined
// instance default
}
...
...
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