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
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
Pleroma
pleroma-fe
Commits
0ac34b30
Commit
0ac34b30
authored
4 years ago
by
Shpuld Shpludson
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 'rc/2.3.0'
# Conflicts: # CHANGELOG.md
parents
06cde8ad
320418d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1712
fix master/develop merge conflicts
,
!1366
2.3.0 to MASTER
Pipeline
#35280
passed
4 years ago
Stage: lint
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/services/notifications_fetcher/notifications_fetcher.service.js
+3
-0
3 additions, 0 deletions
...es/notifications_fetcher/notifications_fetcher.service.js
with
4 additions
and
0 deletions
CHANGELOG.md
+
1
−
0
View file @
0ac34b30
...
...
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Added reason field for registration when approval is required
-
Group staff members by role in the About page
## [2.2.3] - 2021-01-18
### Added
-
Added Report button to status ellipsis menu for easier reporting
...
...
This diff is collapsed.
Click to expand it.
src/services/notifications_fetcher/notifications_fetcher.service.js
+
3
−
0
View file @
0ac34b30
...
...
@@ -11,9 +11,12 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
const
rootState
=
store
.
rootState
||
store
.
state
const
timelineData
=
rootState
.
statuses
.
notifications
const
hideMutedPosts
=
getters
.
mergedConfig
.
hideMutedPosts
const
allowFollowingMove
=
rootState
.
users
.
currentUser
.
allow_following_move
args
[
'
withMuted
'
]
=
!
hideMutedPosts
args
[
'
withMove
'
]
=
!
allowFollowingMove
args
[
'
timeline
'
]
=
'
notifications
'
if
(
older
)
{
if
(
timelineData
.
minId
!==
Number
.
POSITIVE_INFINITY
)
{
...
...
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