Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
pleroma-fe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
20
Merge Requests
20
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
pleroma-fe
Commits
3f23aecd
Commit
3f23aecd
authored
Feb 23, 2021
by
Shpuld Shpludson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add sensitive by default option
parent
5faca012
Pipeline
#35106
passed with stages
in 5 minutes and 29 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
4 deletions
+12
-4
src/components/post_status_form/post_status_form.js
src/components/post_status_form/post_status_form.js
+2
-2
src/components/settings_modal/tabs/general_tab.vue
src/components/settings_modal/tabs/general_tab.vue
+6
-1
src/i18n/en.json
src/i18n/en.json
+1
-0
src/modules/config.js
src/modules/config.js
+2
-1
src/modules/instance.js
src/modules/instance.js
+1
-0
No files found.
src/components/post_status_form/post_status_form.js
View file @
3f23aecd
...
...
@@ -115,7 +115,7 @@ const PostStatusForm = {
?
this
.
copyMessageScope
:
this
.
$store
.
state
.
users
.
currentUser
.
default_scope
const
{
postContentType
:
contentType
}
=
this
.
$store
.
getters
.
mergedConfig
const
{
postContentType
:
contentType
,
sensitiveByDefault
}
=
this
.
$store
.
getters
.
mergedConfig
return
{
dropFiles
:
[],
...
...
@@ -126,7 +126,7 @@ const PostStatusForm = {
newStatus
:
{
spoilerText
:
this
.
subject
||
''
,
status
:
statusText
,
nsfw
:
false
,
nsfw
:
!!
sensitiveByDefault
,
files
:
[],
poll
:
{},
mediaDescriptions
:
{},
...
...
src/components/settings_modal/tabs/general_tab.vue
View file @
3f23aecd
...
...
@@ -144,7 +144,12 @@
<
/li
>
<
li
>
<
BooleanSetting
path
=
"
minimalScopesMode
"
>
{{
$t
(
'
settings.minimal_scopes_mode
'
)
}}
{{
minimalScopesModeDefaultValue
}}
{{
$t
(
'
settings.minimal_scopes_mode
'
)
}}
<
/BooleanSetting
>
<
/li
>
<
li
>
<
BooleanSetting
path
=
"
sensitiveByDefault
"
>
{{
$t
(
'
settings.sensitive_by_default
'
)
}}
<
/BooleanSetting
>
<
/li
>
<
li
>
...
...
src/i18n/en.json
View file @
3f23aecd
...
...
@@ -429,6 +429,7 @@
"subject_line_mastodon"
:
"Like mastodon: copy as is"
,
"subject_line_noop"
:
"Do not copy"
,
"post_status_content_type"
:
"Post status content type"
,
"sensitive_by_default"
:
"Mark posts as sensitive by default"
,
"stop_gifs"
:
"Play-on-hover GIFs"
,
"streaming"
:
"Enable automatic streaming of new posts when scrolled to the top"
,
"user_mutes"
:
"Users"
,
...
...
src/modules/config.js
View file @
3f23aecd
...
...
@@ -67,7 +67,8 @@ export const defaultState = {
greentext
:
undefined
,
// instance default
hidePostStats
:
undefined
,
// instance default
hideUserStats
:
undefined
,
// instance default
virtualScrolling
:
undefined
// instance default
virtualScrolling
:
undefined
,
// instance default
sensitiveByDefault
:
undefined
}
// caching the instance default properties
...
...
src/modules/instance.js
View file @
3f23aecd
...
...
@@ -43,6 +43,7 @@ const defaultState = {
subjectLineBehavior
:
'
email
'
,
theme
:
'
pleroma-dark
'
,
virtualScrolling
:
true
,
sensitiveByDefault
:
false
,
// Nasty stuff
customEmoji
:
[],
...
...
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