Commit Graph

5063 Commits

Author SHA1 Message Date
zhichen
daca668d84 fix namespace bug 2018-09-28 19:33:37 +08:00
nkorange
b603b2ca39 Add naming console api 2018-09-28 16:23:55 +08:00
nkorange
5331546d2f Add naming console api 2018-09-28 16:22:34 +08:00
hxy1991
04045bee77 Fix #91 2018-09-28 16:14:05 +08:00
hxy1991
d3013f800a Merge branch 'upstream' 2018-09-28 16:06:26 +08:00
王彦民
6d2345fec8 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-28 15:41:59 +08:00
王彦民
acea58c082 feat: 服务列表接口对接 2018-09-28 15:41:43 +08:00
water.lyl
a57a6f41ee [motify info] change menu 2018-09-28 15:30:43 +08:00
zhichen
e68f5ca9ca add ServiceManagement i18n and remove some variable which never be used 2018-09-28 14:44:04 +08:00
water.lyl
165bce8ade [motify info] fix namespace cannot save problem 2018-09-28 14:36:28 +08:00
zhichen
22b8e605c5 fix doc site url 2018-09-28 14:35:00 +08:00
water.lyl
802979e27b [motify info] recovery static file 2018-09-28 11:48:40 +08:00
nkorange
af35525850 Merge branch 'master' into 0.3.0
Conflicts:
	console/src/main/resources/static/.gitignore
	console/src/main/resources/static/.webpackrc
	console/src/main/resources/static/README.md
	console/src/main/resources/static/i18ndoc.js
	console/src/main/resources/static/index.js
	console/src/main/resources/static/package.json
	console/src/main/resources/static/public/i18ndoc.js
	console/src/main/resources/static/src/components/EditorNameSpace.js
	console/src/main/resources/static/src/components/NameSpaceList.js
	console/src/main/resources/static/src/components/NewNameSpace.js
	console/src/main/resources/static/src/components/ValidateDialog.js
	console/src/main/resources/static/src/menu.js
	console/src/main/resources/static/src/pages/Configeditor.js
	console/src/main/resources/static/src/pages/ConfigurationManagement.js
	console/src/main/resources/static/src/pages/Namespace.js
	console/src/main/resources/static/src/router.js
2018-09-28 10:29:11 +08:00
water.lyl
20a5f80956 [motify info] fix pmd 2018-09-28 09:44:29 +08:00
water.lyl
fc44a1264b [motify info] update namespace config 2018-09-27 22:54:19 +08:00
water.lyl
386d3cc1ad [motify info] namespace manage 2018-09-27 22:44:13 +08:00
Fury Zhu
5f95bf3c51
Merge pull request #88 from alibaba/feature_ServiceMesh_update
* fix config pom.xml version
2018-09-27 14:46:05 +08:00
caogu.wyp@alibaba-inc.com
e8d1619c38 * fix config pom.xml version
* support nacos go version and language recognition(#87)
2018-09-27 14:39:21 +08:00
xxc
0b5add22c7
Merge pull request #81 from alibaba/0.2.2
0.2.2
2018-09-27 14:28:08 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
zhichen
a56f4c6c52
Merge pull request #85 from loadchange/0.3.0
feat: service page
2018-09-27 14:00:31 +08:00
nkorange
37f8260940 Fix version error 2018-09-27 12:33:54 +08:00
王彦民
3d5b4b91d4 feat: service page 2018-09-27 10:59:32 +08:00
Keep
b98fb2cb56
Merge pull request #83 from alibaba/fix_bug
fix duplicate Maven dependencies(#82)
2018-09-27 00:56:11 +08:00
caogu.wyp@alibaba-inc.com
5803c6b34d fix duplicate Maven dependencies(#82) 2018-09-27 00:04:06 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
e3a40d7610 fix wrong shell to startup server, thanks to yanj0609 2018-09-26 20:32:28 +08:00
xxc
874f4403a2
Merge pull request #72 from yanj0609/master
[ISSUE #69] Fix application cannot use {BASE_DIR}/conf/application.properties
2018-09-26 20:24:56 +08:00
xxc
95fa09ac73
Update .travis.yml 2018-09-26 20:19:40 +08:00
xxc
1044a433a3
Merge pull request #80 from alibaba/0.2.1
0.2.1
2018-09-26 20:17:19 +08:00
xuechaos
7997644589 del nacos server port in startup.cmd 2018-09-26 20:14:36 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
caogu.wyp@alibaba-inc.com
d5dd0f95ec Merge branch 'master' of github.com:alibaba/nacos 2018-09-26 20:03:43 +08:00
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
xxc
eb4994f2dd
Update PULL_REQUEST_TEMPLATE.md 2018-09-26 19:08:37 +08:00
nkorange
f1c5dac508 Fix #78 2018-09-26 17:38:25 +08:00
caogu.wyp@alibaba-inc.com
be97fbd5c7 init nacos serviceMesh 2018-09-26 17:36:21 +08:00
zhichen
5b27dd4221 modify README.md 2018-09-25 15:00:53 +08:00
hxy1991
b69e7da751 Eliminate warnings: Redundant array creation for calling varargs method 2018-09-24 22:18:16 +08:00
xuechaos
01afa98697 update config pom 2018-09-21 16:58:31 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
nkorange
ba84fda664 Fix #66 2018-09-21 16:19:25 +08:00
nkorange
4b5bdec0ab Fix #66, Enable deregistering the last instance 2018-09-21 16:13:41 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +08:00
yanj0609
135524a8c8 Fix #69
* Add external config location to default config locations.

* The option '-cp' will be ignored when using 'java -jar'.
2018-09-20 23:23:06 +08:00
zhichen
f04be0b7ca ignore i18ndoc.js 2018-09-20 20:31:10 +08:00
zhichen
5c04f1f274 add build.js 2018-09-20 20:15:23 +08:00
nkorange
188d4314f6 Fix test case bug 2018-09-20 16:22:05 +08:00
hxy1991
65153c3138 Update "pom.xml" for removing <distributionManagement> 2018-09-19 22:23:47 +08:00