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
803edcb5
Commit
803edcb5
authored
5 years ago
by
HJ
Browse files
Options
Downloads
Patches
Plain Diff
dismiss warning when loading theme
parent
1191207a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1074
Update master with 2.0.0
,
!1037
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/style_switcher/style_switcher.js
+2
-1
2 additions, 1 deletion
src/components/style_switcher/style_switcher.js
src/i18n/en.json
+1
-0
1 addition, 0 deletions
src/i18n/en.json
with
3 additions
and
1 deletion
src/components/style_switcher/style_switcher.js
+
2
−
1
View file @
803edcb5
...
...
@@ -162,7 +162,7 @@ export default {
}
else
if
(
origin
===
'
localStorage
'
)
{
// FE upgraded from v2
if
(
themeEngineVersion
===
2
)
{
return
'
upgraded_from_v2
'
return
t
(
pre
+
'
upgraded_from_v2
'
)
}
// Admin downgraded FE
if
(
themeEngineVersion
>
CURRENT_VERSION
)
{
...
...
@@ -426,6 +426,7 @@ export default {
this
.
onImport
(
this
.
tempImportFile
,
true
)
break
}
this
.
dismissWarning
()
},
loadThemeFromLocalStorage
(
confirmLoadSource
=
false
)
{
const
{
...
...
This diff is collapsed.
Click to expand it.
src/i18n/en.json
+
1
−
0
View file @
803edcb5
...
...
@@ -399,6 +399,7 @@
"load_theme"
:
"Load theme"
,
"use_snapshot"
:
"Keep as is"
,
"help"
:
{
"upgraded_from_v2"
:
"PleromaFE has been upgraded, theme could look a little bit different than you remember."
,
"v2_imported"
:
"File you imported was made for older FE. We try to maximize compatibility but there still could be inconsitencies."
,
"future_version_imported"
:
"File you imported was made in newer version of FE."
,
"older_version_imported"
:
"File you imported was made in older version of FE."
,
...
...
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