Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pleroma-fe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Your New SJW Waifu
pleroma-fe
Commits
6c38e954
Commit
6c38e954
authored
Feb 11, 2020
by
Your New SJW Waifu
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/develop' into neckbeard
parents
190b30f1
17b6d8dd
Pipeline
#22734
passed with stages
in 8 minutes
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
116 additions
and
8 deletions
+116
-8
CHANGELOG.md
CHANGELOG.md
+1
-0
src/components/interactions/interactions.js
src/components/interactions/interactions.js
+1
-0
src/components/interactions/interactions.vue
src/components/interactions/interactions.vue
+1
-0
src/components/mrf_transparency_panel/mrf_transparency_panel.js
...mponents/mrf_transparency_panel/mrf_transparency_panel.js
+9
-1
src/components/mrf_transparency_panel/mrf_transparency_panel.vue
...ponents/mrf_transparency_panel/mrf_transparency_panel.vue
+43
-0
src/components/status/status.js
src/components/status/status.js
+10
-0
src/components/status/status.vue
src/components/status/status.vue
+15
-1
src/components/user_settings/user_settings.js
src/components/user_settings/user_settings.js
+2
-0
src/components/user_settings/user_settings.vue
src/components/user_settings/user_settings.vue
+6
-3
src/i18n/en.json
src/i18n/en.json
+11
-1
src/services/api/api.service.js
src/services/api/api.service.js
+5
-1
src/services/entity_normalizer/entity_normalizer.service.js
src/services/entity_normalizer/entity_normalizer.service.js
+2
-0
src/services/notifications_fetcher/notifications_fetcher.service.js
...es/notifications_fetcher/notifications_fetcher.service.js
+3
-0
static/fontello.json
static/fontello.json
+7
-1
No files found.
CHANGELOG.md
View file @
6c38e954
...
...
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Pleroma AMOLED dark theme
-
User level domain mutes, under User Settings -> Mutes
-
Emoji reactions for statuses
-
MRF keyword policy disclosure
### Changed
-
Captcha now resets on failed registrations
-
Notifications column now cleans itself up to optimize performance when tab is left open for a long time
...
...
src/components/interactions/interactions.js
View file @
6c38e954
...
...
@@ -10,6 +10,7 @@ const tabModeDict = {
const
Interactions
=
{
data
()
{
return
{
allowFollowingMove
:
this
.
$store
.
state
.
users
.
currentUser
.
allow_following_move
,
filterMode
:
tabModeDict
[
'
mentions
'
]
}
},
...
...
src/components/interactions/interactions.vue
View file @
6c38e954
...
...
@@ -22,6 +22,7 @@
:label=
"$t('interactions.follows')"
/>
<span
v-if=
"!allowFollowingMove"
key=
"moves"
:label=
"$t('interactions.moves')"
/>
...
...
src/components/mrf_transparency_panel/mrf_transparency_panel.js
View file @
6c38e954
...
...
@@ -11,7 +11,10 @@ const MRFTransparencyPanel = {
rejectInstances
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_simple.reject
'
,
[]),
ftlRemovalInstances
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_simple.federated_timeline_removal
'
,
[]),
mediaNsfwInstances
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_simple.media_nsfw
'
,
[]),
mediaRemovalInstances
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_simple.media_removal
'
,
[])
mediaRemovalInstances
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_simple.media_removal
'
,
[]),
keywordsFtlRemoval
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_keyword.federated_timeline_removal
'
,
[]),
keywordsReject
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_keyword.reject
'
,
[]),
keywordsReplace
:
state
=>
get
(
state
,
'
instance.federationPolicy.mrf_keyword.replace
'
,
[])
}),
hasInstanceSpecificPolicies
()
{
return
this
.
quarantineInstances
.
length
||
...
...
@@ -20,6 +23,11 @@ const MRFTransparencyPanel = {
this
.
ftlRemovalInstances
.
length
||
this
.
mediaNsfwInstances
.
length
||
this
.
mediaRemovalInstances
.
length
},
hasKeywordPolicies
()
{
return
this
.
keywordsFtlRemoval
.
length
||
this
.
keywordsReject
.
length
||
this
.
keywordsReplace
.
length
}
}
}
...
...
src/components/mrf_transparency_panel/mrf_transparency_panel.vue
View file @
6c38e954
...
...
@@ -109,6 +109,49 @@
/>
</ul>
</div>
<h2
v-if=
"hasKeywordPolicies"
>
{{
$t
(
"
about.mrf.keyword.keyword_policies
"
)
}}
</h2>
<div
v-if=
"keywordsFtlRemoval.length"
>
<h4>
{{
$t
(
"
about.mrf.keyword.ftl_removal
"
)
}}
</h4>
<ul>
<li
v-for=
"keyword in keywordsFtlRemoval"
:key=
"keyword"
v-text=
"keyword"
/>
</ul>
</div>
<div
v-if=
"keywordsReject.length"
>
<h4>
{{
$t
(
"
about.mrf.keyword.reject
"
)
}}
</h4>
<ul>
<li
v-for=
"keyword in keywordsReject"
:key=
"keyword"
v-text=
"keyword"
/>
</ul>
</div>
<div
v-if=
"keywordsReplace.length"
>
<h4>
{{
$t
(
"
about.mrf.keyword.replace
"
)
}}
</h4>
<ul>
<li
v-for=
"keyword in keywordsReplace"
:key=
"keyword"
>
{{
keyword
.
pattern
}}
{{
$t
(
"
about.mrf.keyword.is_replaced_by
"
)
}}
{{
keyword
.
replacement
}}
</li>
</ul>
</div>
</div>
</div>
</div>
...
...
src/components/status/status.js
View file @
6c38e954
...
...
@@ -256,6 +256,16 @@ const Status = {
file
=>
!
fileType
.
fileMatchesSomeType
(
this
.
galleryTypes
,
file
)
)
},
hasImageAttachments
()
{
return
this
.
status
.
attachments
.
some
(
file
=>
fileType
.
fileType
(
file
.
mimetype
)
===
'
image
'
)
},
hasVideoAttachments
()
{
return
this
.
status
.
attachments
.
some
(
file
=>
fileType
.
fileType
(
file
.
mimetype
)
===
'
video
'
)
},
maxThumbnails
()
{
return
this
.
mergedConfig
.
maxThumbnails
},
...
...
src/components/status/status.vue
View file @
6c38e954
...
...
@@ -277,7 +277,21 @@
href=
"#"
class=
"cw-status-hider"
@
click.prevent=
"toggleShowMore"
>
{{ $t("general.show_more") }}
</a>
>
{{ $t("general.show_more") }}
<span
v-if=
"hasImageAttachments"
class=
"icon-picture"
/>
<span
v-if=
"hasVideoAttachments"
class=
"icon-video"
/>
<span
v-if=
"status.card"
class=
"icon-link"
/>
</a>
<a
v-if=
"showingMore"
href=
"#"
...
...
src/components/user_settings/user_settings.js
View file @
6c38e954
...
...
@@ -55,6 +55,7 @@ const UserSettings = {
showRole
:
this
.
$store
.
state
.
users
.
currentUser
.
show_role
,
role
:
this
.
$store
.
state
.
users
.
currentUser
.
role
,
discoverable
:
this
.
$store
.
state
.
users
.
currentUser
.
discoverable
,
allowFollowingMove
:
this
.
$store
.
state
.
users
.
currentUser
.
allow_following_move
,
pickAvatarBtnVisible
:
true
,
bannerUploading
:
false
,
backgroundUploading
:
false
,
...
...
@@ -162,6 +163,7 @@ const UserSettings = {
hide_follows
:
this
.
hideFollows
,
hide_followers
:
this
.
hideFollowers
,
discoverable
:
this
.
discoverable
,
allow_following_move
:
this
.
allowFollowingMove
,
hide_follows_count
:
this
.
hideFollowsCount
,
hide_followers_count
:
this
.
hideFollowersCount
,
show_role
:
this
.
showRole
...
...
src/components/user_settings/user_settings.vue
View file @
6c38e954
...
...
@@ -90,9 +90,7 @@
</Checkbox>
</p>
<p>
<Checkbox
v-model=
"hideFollowers"
>
<Checkbox
v-model=
"hideFollowers"
>
{{ $t('settings.hide_followers_description') }}
</Checkbox>
</p>
...
...
@@ -104,6 +102,11 @@
{{ $t('settings.hide_followers_count_description') }}
</Checkbox>
</p>
<p>
<Checkbox
v-model=
"allowFollowingMove"
>
{{ $t('settings.allow_following_move') }}
</Checkbox>
</p>
<p
v-if=
"role === 'admin' || role === 'moderator'"
>
<Checkbox
v-model=
"showRole"
>
<
template
v-if=
"role === 'admin'"
>
...
...
src/i18n/en.json
View file @
6c38e954
...
...
@@ -16,7 +16,16 @@
"mrf_policy_simple_media_removal"
:
"Media Removal"
,
"mrf_policy_simple_media_removal_desc"
:
"This instance removes media from posts on the following instances:"
,
"mrf_policy_simple_media_nsfw"
:
"Media Force-set As Sensitive"
,
"mrf_policy_simple_media_nsfw_desc"
:
"This instance forces media to be set sensitive in posts on the following instances:"
"mrf_policy_simple_media_nsfw_desc"
:
"This instance forces media to be set sensitive in posts on the following instances:"
,
"mrf"
:
{
"keyword"
:
{
"keyword_policies"
:
"Keyword Policies"
,
"ftl_removal"
:
"Removal from
\"
The Whole Known Network
\"
Timeline"
,
"reject"
:
"Reject"
,
"replace"
:
"Replace"
,
"is_replaced_by"
:
"→"
}
}
},
"chat"
:
{
"title"
:
"Chat"
...
...
@@ -232,6 +241,7 @@
"desc"
:
"To enable two-factor authentication, enter the code from your two-factor app:"
}
},
"allow_following_move"
:
"Allow auto-follow when following account moves"
,
"attachmentRadius"
:
"Attachments"
,
"attachments"
:
"Attachments"
,
"autoload"
:
"Enable automatic loading when scrolled to the bottom"
,
...
...
src/services/api/api.service.js
View file @
6c38e954
...
...
@@ -495,7 +495,8 @@ const fetchTimeline = ({
until
=
false
,
userId
=
false
,
tag
=
false
,
withMuted
=
false
withMuted
=
false
,
withMove
=
false
})
=>
{
const
timelineUrls
=
{
public
:
MASTODON_PUBLIC_TIMELINE
,
...
...
@@ -535,6 +536,9 @@ const fetchTimeline = ({
if
(
timeline
===
'
public
'
||
timeline
===
'
publicAndExternal
'
)
{
params
.
push
([
'
only_media
'
,
false
])
}
if
(
timeline
===
'
notifications
'
)
{
params
.
push
([
'
with_move
'
,
withMove
])
}
params
.
push
([
'
count
'
,
20
])
params
.
push
([
'
with_muted
'
,
withMuted
])
...
...
src/services/entity_normalizer/entity_normalizer.service.js
View file @
6c38e954
...
...
@@ -83,6 +83,8 @@ export const parseUser = (data) => {
output
.
subscribed
=
relationship
.
subscribing
}
output
.
allow_following_move
=
data
.
pleroma
.
allow_following_move
output
.
hide_follows
=
data
.
pleroma
.
hide_follows
output
.
hide_followers
=
data
.
pleroma
.
hide_followers
output
.
hide_follows_count
=
data
.
pleroma
.
hide_follows_count
...
...
src/services/notifications_fetcher/notifications_fetcher.service.js
View file @
6c38e954
...
...
@@ -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
)
{
...
...
static/fontello.json
View file @
6c38e954
...
...
@@ -339,6 +339,12 @@
"css"
:
"arrow-curved"
,
"code"
:
59426
,
"src"
:
"iconic"
},
{
"uid"
:
"0ddd3e8201ccc7d41f7b7c9d27eca6c1"
,
"css"
:
"link"
,
"code"
:
59427
,
"src"
:
"fontawesome"
}
]
}
\ No newline at end of file
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment