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
bb2ff977
Commit
bb2ff977
authored
5 years ago
by
Shpuld Shpludson
Browse files
Options
Downloads
Patches
Plain Diff
Default video inlining true and make the config stuff work
parent
fbe7af3d
Branches
bugfix/object-fetching-handle-mrf-reject
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#6863
passed
5 years ago
Stage: lint
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/boot/after_store.js
+1
-0
1 addition, 0 deletions
src/boot/after_store.js
src/components/settings/settings.js
+3
-1
3 additions, 1 deletion
src/components/settings/settings.js
static/config.json
+1
-3
1 addition, 3 deletions
static/config.json
with
5 additions
and
4 deletions
src/boot/after_store.js
+
1
−
0
View file @
bb2ff977
...
...
@@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption
(
'
subjectLineBehavior
'
)
copyInstanceOption
(
'
alwaysShowSubjectInput
'
)
copyInstanceOption
(
'
noAttachmentLinks
'
)
copyInstanceOption
(
'
playVideosInline
'
)
if
((
config
.
chatDisabled
))
{
store
.
dispatch
(
'
disableChat
'
)
...
...
This diff is collapsed.
Click to expand it.
src/components/settings/settings.js
+
3
−
1
View file @
bb2ff977
...
...
@@ -66,7 +66,9 @@ const settings = {
Object
.
getOwnPropertyDescriptor
(
HTMLMediaElement
.
prototype
,
'
webkitAudioDecodedByteCount
'
)
||
// Future spec, still not supported in Nightly 63 as of 08/2018
Object
.
getOwnPropertyDescriptor
(
HTMLMediaElement
.
prototype
,
'
audioTracks
'
),
playVideosInline
:
user
.
playVideosInline
,
playVideosInline
:
typeof
user
.
playVideosInline
===
'
undefined
'
?
instance
.
playVideosInline
:
user
.
playVideosInline
,
useContainFit
:
user
.
useContainFit
}
},
...
...
This diff is collapsed.
Click to expand it.
static/config.json
+
1
−
3
View file @
bb2ff977
...
...
@@ -20,7 +20,5 @@
"webPushNotifications"
:
false
,
"noAttachmentLinks"
:
false
,
"nsfwCensorImage"
:
""
,
"useOneClickNsfw"
:
true
,
"playVideosInline"
:
false
,
"useContainFit"
:
false
"playVideosInline"
:
true
,
}
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