Commit Graph

459 Commits

Author SHA1 Message Date
赵禹光
61ae002cea no message 2019-07-30 15:06:04 +08:00
赵禹光
224f2237e6 Merge commit 'ad5c249e7c852daf4e2f7b09b9c12c432d5b3cf7' into z_wcek_1479
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-07-30 15:04:42 +08:00
LoadChange
d1127041cf fix: closes #1520 2019-07-20 18:09:04 +08:00
LoadChange
5d019cb55e fix: closes #1521 2019-07-14 17:00:53 +08:00
赵禹光
511e134ec5 fix1479 2019-07-13 12:43:01 +08:00
nkorange
7ddaf19106 Build console 2019-07-09 14:46:25 +08:00
keran
551f64ba84 导出查询结果增加dataId条件 2019-07-09 13:38:28 +08:00
Fury Zhu
a15fc9faf7
Merge pull request #1494 from loadchange/feat/1.1.0
Fix ConfigEditor
2019-07-06 20:06:07 +08:00
LoadChange
8eb2677738 fix: edit configuration show data 2019-07-05 22:17:46 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
Fury Zhu
d2f26bd4e4
Merge pull request #1483 from loadchange/feat/1.1.0
Fix edit configuration publish beta
2019-07-05 12:54:11 +08:00
Fury Zhu
fbe01896f7
Merge pull request #1461 from alibaba/feature_address_server
support address server mode and nacos client will use the endpoint to initializer
2019-07-05 12:51:39 +08:00
LoadChange
996faf298f fix: edit configuration publish beta 2019-07-05 11:46:37 +08:00
Fury Zhu
9210a507bf
Merge pull request #1482 from KeRan213539/exportAndImportBugFix
fix: Export and import
2019-07-05 10:53:19 +08:00
keran
751699200c 修改错别字 2019-07-05 10:40:09 +08:00
LoadChange
592d911b97 fix: edit configuration type default value 2019-07-04 20:37:26 +08:00
LoadChange
b29953a594 fix: closes #1476 2019-07-04 20:15:06 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
LoadChange
38866a464c fix: closes #1476 2019-07-04 14:39:01 +08:00
LoadChange
17442b6523 fix: config editor beta button 2019-07-04 11:13:23 +08:00
LoadChange
c3f160fe87 fix: config editor 2019-07-03 20:09:09 +08:00
Fury Zhu
c0fc702e9e
Merge pull request #1467 from loadchange/feat/1.1.0
ConfigEditor support beta
2019-07-03 18:31:06 +08:00
LoadChange
f39bf12e54 feat: NewConfigEditor api 对接 2019-07-02 22:09:42 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +08:00
LoadChange
a3800864ad feat: NewConfigEditor 2019-07-01 22:07:30 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
keran
e7ac873fe3 按照review意见修改 2019-07-01 17:49:18 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
Fury Zhu
75b52924ae
Merge pull request #1436 from loadchange/feat/1.1.0
Feat component subscribers
2019-06-27 18:46:18 +08:00
LoadChange
6be57033c2 feat: component subscribers 2019-06-26 11:33:38 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier
optimize modifier access
2019-06-24 10:17:39 +08:00
LoadChange
9381a10d1f refactor: closes #1354 2019-06-23 21:55:11 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize
remove unused import
2019-06-20 13:58:50 +08:00
slievrly
21bf279532 optimize modifier access
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +08:00
LoadChange
fcda55b95e refactor: closes #1352 2019-06-19 12:08:36 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
zhichen
cdcbf10854 resolve conflict #1084 2019-06-10 16:45:20 +08:00
Fury Zhu
555e323302
Merge pull request #1258 from universefeeler/master
[ISSUE #876] feature(console):support console show cluster node state
2019-06-10 16:16:36 +08:00
universefeeler
5d9ae1541d chore(console): adjust console show details 2019-06-10 13:02:12 +08:00
yongchao9
748070cb71 #169 示例代码中的服务名与点击记录进行联动
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-07 11:56:41 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
yongchao9
320a496625 同步develop分支pom配置
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-06 08:51:31 +08:00
yongchao9
224bc9c7cc 删除log文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-06 08:43:09 +08:00