Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
1bbd90b9
Unverified
Commit
1bbd90b9
authored
Sep 21, 2018
by
Liang Ding
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.9.5-dev' of
https://github.com/b3log/solo
into 2.9.5-dev
parents
67c80cb0
34ce91f9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
11 deletions
+1
-11
src/main/webapp/js/common.js
src/main/webapp/js/common.js
+0
-10
src/main/webapp/skins
src/main/webapp/skins
+1
-1
No files found.
src/main/webapp/js/common.js
View file @
1bbd90b9
...
@@ -251,16 +251,6 @@ var Util = {
...
@@ -251,16 +251,6 @@ var Util = {
addKillPanel
();
addKillPanel
();
return
;
return
;
}
}
// 后台页面 kill 360
if
(
window
.
external
&&
window
.
external
.
twGetRunPath
)
{
var
path
=
external
.
twGetRunPath
();
if
(
path
&&
path
.
toLowerCase
().
indexOf
(
"
360se
"
)
>
-
1
&&
window
.
location
.
href
.
indexOf
(
"
admin-index
"
)
>
-
1
)
{
addKillPanel
();
return
;
}
}
}
}
},
},
/**
/**
...
...
skins
@
5008cd80
Subproject commit
f9607e2c432ec40fb8bedce05eb232e3bdb071b0
Subproject commit
5008cd80069d06f8fed1d08ee6c5fa6a0b0819d1
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