8000 0.3.0 by yanlinly · Pull Request #178 · alibaba/nacos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

0.3.0 #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 26, 2018
Merged

0.3.0 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0ab5bf9
fix: ServiceDetail page table column fixed width
loadchange Oct 24, 2018
f9959e1
remove 404 request #156
jameslcj Oct 25, 2018
90e5c95
# fix 156
yanlinly Oct 26, 2018
acfac48
Fix #142
yanlinly Oct 26, 2018
c8804a5
static cdn fix#155
jameslcj Oct 26, 2018
e226b5e
Fix #145
yanlinly Oct 26, 2018
91cc27a
fix #171
jameslcj Oct 26, 2018
b97d0b4
Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0
jameslcj Oct 26, 2018
82781bb
Fix #171
yanlinly Oct 26, 2018
2a2a533
Merge branch 'master' into 0.3
xuechaos Oct 26, 2018
1583369
0.3 merge master
xuechaos Oct 26, 2018
c32fbd9
update lisence header
xuechaos Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions console/src/main/resources/static/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"editor.tabSize": 2,
"editor.formatOnSave": true,
"[javascript]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": false
},
"[javascriptreact]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": false
},
"[typescript]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": false
},
"[typescriptreact]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": false
},
"[html]": {
"editor.formatOnSave": true
}
}

25 changes: 10 additions & 15 deletions console/src/main/resources/static/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,13 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
});

spawnAsync('roadhog', ['build'])
.then(() => {
const _buildDir = path.join(__dirname, buildDir);
if (!fs.statSync(_buildDir).isDirectory()) {
return;
}
let fileList = fs.readdirSync(_buildDir, "utf8");
fileList.forEach((fileName) => {
if (fileName === "." || fileName === "..") {
return;
}
const _buildPath = path.join(buildDir, fileName);
const _targetPath = path.join(targetDir, fileName);
fs.writeFileSync(_targetPath, fs.readFileSync(_buildPath, "utf8"), "utf8");
})
});
.then(() => {
// 复制index.js
const copyFileList = ['index.js', 'index.css'];
copyFileList.forEach((fileName) => {
const _srcFileName = path.join(buildDir, fileName);
const _targetFileName = path.join(targetDir, fileName);

fs.writeFileSync(_targetFileName, fs.readFileSync(_srcFileName, "utf8"), "utf8");
});
});
1,027 changes: 0 additions & 1,027 deletions console/src/main/resources/static/i18ndoc.js
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 19 additions & 27 deletions console/src/main/resources/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,15 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Nacos</title>
<link rel="shortcut icon" href="//www.aliyun.com/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="//g.alicdn.com/aliyun/console-base/0.0.18/app.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/bootstrap/bootstrap.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/console1412.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm/edas/2.132.6/styles/edas/edas.console.css">
<link rel="stylesheet" type=" 3D11 text/css" href="public/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="public/css/console1412.css">
<!-- 第三方css开始 -->
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/bootstrap.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm-design/simpleMVC/public/styles/icons/icon.css">
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/font-awesome.css">
<link rel="stylesheet" type="text/css" href="index.css">

<link rel="stylesheet" type="text/css" href="public/css/codemirror.css">
<link rel="stylesheet" type="text/css" href="public/css/merge.css">
<link rel="stylesheet" type="text/css" href="public/css/icon.css">
<link rel="stylesheet" type="text/css" href="public/css/font-awesome.css">
<!-- 第三方css结束 -->
<script src="//g.alicdn.com/cm-design/simplemvc-cdn/0.0.67/jquery.js"></script>
<!-- i18nJs开始 -->
<script src="i18ndoc.js"></script>
<!-- i18nJs结束 -->
<link rel="stylesheet" type="text/css" href="index.css">
</head>

<body>
Expand All @@ -45,18 +37,18 @@
<div id="other"></div>

<!-- 第三方js开始 -->
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.64/naruto/lib/codemirror.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/javascript.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/xml.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.fullscreen.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.lint.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.json-lint.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.json-lint.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.clike-lint.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/diff_match_patch.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.js"></script>
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/loader.js"></script>

<script src="public/js/jquery.js"></script>
<script src="public/js/codemirror.js"></script>
<script src="public/js/javascript.js"></script>
<script src="public/js/xml.js"></script>
<script src="public/js/codemirror.addone.fullscreen.js"></script>
<script src="public/js/codemirror.addone.lint.js"></script>
<script src="public/js/codemirror.lib.json-lint.js"></script>
<script src="public/js/codemirror.addone.json-lint.js"></script>
<script src="public/js/codemirror.lib.clike-lint.js"></script>
<script src="public/js/diff_match_patch.js"></script>
<script src="public/js/merge.js"></script>
<script src="public/js/loader.js"></script>
<!-- 第三方js结束 -->
<script src="index.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/resources/static/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion console/src/main/resources/static/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
"husky": "^0.12.0",
"roadhog": "^2.0.0"
}
}
}
Loading
0