Commit Graph

1638 Commits

Author SHA1 Message Date
Fury Zhu
67ec4a4858
Merge pull request #1262 from dupengcheng/master
fix: #1260
2019-06-04 16:44:21 +08:00
pbting
3b869fcdbe change the comment from Chinese to English 2019-06-04 16:44:12 +08:00
Fury Zhu
3174aae243
Merge pull request #1290 from chuntaojun/develop
feat(client): @NacosConfigurationProperties support yaml style config
2019-06-04 16:29:53 +08:00
pbting
9d57976167 change the comment from Chinese to English 2019-06-04 16:21:21 +08:00
Fury Zhu
403e9b830a
Merge pull request #1303 from IanCao/master
close stream safety & format code
2019-06-04 16:12:03 +08:00
Fury Zhu
f2c061040c
Merge pull request #1309 from IanCao/fixbug2
FIX #1308
2019-06-04 16:09:30 +08:00
pbting
302ae79b3f 1. 注释改成中文
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
2019-06-04 15:55:47 +08:00
Fury Zhu
c97e216158
Merge pull request #1320 from nkorange/feature_search_with_keyword_and_instances
Close #1319
2019-06-04 15:21:35 +08:00
nkorange
fbc72f0def Close #1319 2019-06-04 15:03:05 +08:00
pbting
37b880b72a remove the distributionManagement 2019-05-31 16:16:43 +08:00
IanCao
dd8ee44d65 fix 2019-05-31 16:14:58 +08:00
IanCao
5569e44361 fix 2019-05-31 15:43:34 +08:00
IanCao
40188f5eda fix bug 2019-05-31 15:38:34 +08:00
IanCao
8acce1c5e2 format code 2019-05-31 15:28:34 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
IanCao
4b4c1b167e fix 2019-05-31 14:29:51 +08:00
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