Commit Graph

1721 Commits

Author SHA1 Message Date
IanCao
4fdca26027 close stream safety 2019-05-31 14:26:54 +08:00
caoyixiong
67d2673c93
Merge pull request #1 from alibaba/master
merge
2019-05-31 11:31:51 +08:00
zhichen
554cfe3b53
Merge pull request #1264 from jameslcj/hotfix/676
modify the regular expression of properties validation
2019-05-30 20:03:30 +08:00
pbting
31292389ba Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-05-30 09:08:06 +08:00
Nicholas2015
20af90b821 add license 2019-05-29 22:54:35 +08:00
chuntaojun
97ff458422 feat(client): @NacosConfigurationProperties support yaml style config 2019-05-29 11:21:04 +08:00
yongchao9
1f9cda4918 Merge remote-tracking branch 'upstream/develop' into hotfix_169
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-05-28 21:09:42 +08:00
yongchao9
25611359dc issue#169 服务列表中增加示例代码查看功能 提交编译后文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-05-28 15:53:11 +08:00
keran
162f505fad no message 2019-05-28 14:06:53 +08:00
keran
e0fb599303 no message 2019-05-28 13:15:01 +08:00
keran
8f1edbb93b 删除没用到的变量 2019-05-28 13:05:24 +08:00
keran
eb7009003b 修复当导入目标为public时会报namespace不存在的BUG 2019-05-28 13:04:13 +08:00
keran
0321a0a060 删除不该提交的测试 2019-05-27 22:48:56 +08:00
keran
72d6987b3b 新增克隆相关功能UI 2019-05-27 22:33:11 +08:00
keran
8e92e5a907 新增克隆相关功能接口 2019-05-27 22:32:19 +08:00
Fury Zhu
ed1da58434
Merge pull request #1268 from nkorange/hotfix_jackson_vulnerability
Hotfix jackson vulnerability
2019-05-27 17:23:31 +08:00
Nicholas2015
f6d4ee1252 get subscriber list 2019-05-26 23:43:58 +08:00
dupengcheng
c10165fd6e
Merge branch 'master' into master 2019-05-25 15:22:09 +08:00
Fury Zhu
d5b5dbb85e
Merge branch 'develop' into hotfix_jackson_vulnerability 2019-05-24 19:35:36 +08:00
xxc
54d58b9d1a
Merge pull request #1267 from nkorange/hotfix_jackson_vulnerability
Update jackson version
2019-05-24 17:51:36 +08:00
nkorange
9ccce18e16 Update jackson version 2019-05-24 17:23:51 +08:00
zhichen
e680f10ee8 fix #676 2019-05-24 15:47:59 +08:00
keran
6bd8aebd21 增加集成测试 2019-05-24 15:19:02 +08:00
keran
545ee944b9 修复:导出的配制只有一个的情况下,在导入时选择重复项终止,该项已存在时提示弹窗不显示的BUG 2019-05-24 14:54:24 +08:00
dupengcheng
67741c6712 fix: #1260 2019-05-24 13:18:47 +08:00
keran
8eba1e4a45 no message 2019-05-23 11:49:08 +08:00
keran
b2eb97de9b no message 2019-05-23 10:39:18 +08:00
keran
7e01606347 修改注释 2019-05-23 10:38:08 +08:00
keran
ac0977b711 去除本机开发时增加的数据库配制 2019-05-23 09:11:57 +08:00
universefeeler
c15276cfcb [ISSUE #876] feature(console):support console show cluster node state 2019-05-23 02:41:41 +08:00
keran
4db743072c 新增类加入licences 2019-05-22 16:30:44 +08:00
keran
84ce507528 增加导入导出功能接口和前端部分 2019-05-22 15:32:37 +08:00
keran
6c56240bb9 导入导出前端部分 2019-05-22 15:31:39 +08:00
keran
01a0622c75 增加导入导出功能 2019-05-22 15:31:05 +08:00
yongchao9
b54838948e issue#169 服务列表中增加示例代码查看功能 2019-05-20 22:13:42 +08:00
Fury Zhu
45f01772cb
Merge pull request #1221 from loadchange/issues-1007
Fix Issues #1007
2019-05-20 19:25:23 +08:00
Fury Zhu
dd029a913a
Merge pull request #1240 from nkorange/feature_enable_to_enabled
Fix #1007
2019-05-20 19:24:57 +08:00
Fury Zhu
29dc221ee0
Merge pull request #1243 from paderlol/master
Hotfix mysql8 not support system of windows #1185
2019-05-20 19:24:38 +08:00
pader.zhang
f8b758a6f2 Hotfix mysql8 not support system of windows #1185 2019-05-20 17:43:37 +08:00
pader
0b0e1e2aea
Merge pull request #11 from alibaba/master
pull latest code
2019-05-20 16:53:41 +08:00
Fury Zhu
63c98e1aad
Merge pull request #1241 from alibaba/hotfix_server_list_inconsistent
Fix #1091
2019-05-20 14:48:31 +08:00
Fury Zhu
bceba36372
Merge pull request #1238 from jifengnan/develop
[ISSUE #1227] DomainsManagerTest and RaftStoreTest Don't Work
2019-05-20 12:42:37 +08:00
nkorange
3148ba0e91 Fix #1007 2019-05-20 12:39:43 +08:00
Fury Zhu
35e452e049
Merge pull request #1225 from rushsky518/master
Windows script cannot specify FUNCTION_MODE #1148
2019-05-20 12:18:25 +08:00
keran
bf554055d6 Merge branch 'exportAndImport' of https://github.com/KeRan213539/nacos into exportAndImport 2019-05-19 22:30:54 +08:00
keran
e16a3406e4 修改导出的流程(先弹窗确认),未修改完 2019-05-19 22:30:00 +08:00
keran
14e8d92ec6 导入修改为阿里云ACM方式,支持导入ACM文件 2019-05-19 22:27:15 +08:00
keran
ad3a6953cb 导出重写,导出格式兼容阿里云ACM 2019-05-19 16:49:22 +08:00
Andy
22310d0f18 Correct some unit test cases 2019-05-18 21:14:20 +08:00
Fury Zhu
5cab208cbd
Merge pull request #1228 from sheiy/master
Update pom.xml
2019-05-17 19:24:52 +08:00