Commit Graph

21 Commits

Author SHA1 Message Date
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +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
fc44a1264b [motify info] update namespace config 2018-09-27 22:54:19 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
37f8260940 Fix version error 2018-09-27 12:33:54 +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
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
5dfd4b6451 update version 2018-09-26 19:59: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
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
water.lyl
9839062d32 Fix #67
The configuration module log is changed to config
2018-09-19 19:15:54 +08:00
water.lyl
b9cd75b640 Fix #65
Nacos default port changed from 8080 to 8848
2018-09-19 19:06:03 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
xuechaos
cc33ccd1ad add mysql sql file 2018-07-30 23:05:11 +08:00
xuechaos
4b619cf25a fix windows startup 2018-07-21 13:42:47 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00