Commit Graph

2183 Commits

Author SHA1 Message Date
qq213539
29fd50456f Merge branch 'develop' into sameNamespaceClone#2171
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-12-20 15:02:30 +08:00
邪影oO
df279e4ae1
Merge pull request #11 from alibaba/develop
拉代码
2019-12-20 14:48:12 +08:00
LoadChange
7fa38b6389 refactor: update configuration && build 2019-12-19 17:40:19 +08:00
WG-Roy
be2ea09871 [优化muti delete config js展示bug] (#2191) 2019-12-19 16:55:04 +08:00
nkorange
aef7565403 #1105 Access control finish 82% 2019-12-19 15:33:20 +08:00
邪影oO
6ebec735f5
Merge pull request #10 from alibaba/develop
拉代码
2019-12-19 14:02:50 +08:00
Peter Zhu
83eeeb6a23
Merge pull request #2199 from KeRan213539/RemoveDuplicateMethods
Remove duplicate methods
2019-12-19 13:32:28 +08:00
qq213539
0723fa279d tenantInfoCountByTenantId 2019-12-19 12:36:18 +08:00
Peter Zhu
c9fb61b20f
Merge pull request #2169 from zhenxianyimeng/zhenxianyimeng_fix_console_page_enter
fix page enter bug in configuration Management page
2019-12-19 11:59:41 +08:00
邪影oO
afeb736f2e
Merge pull request #9 from alibaba/develop
拉代码
2019-12-19 11:52:28 +08:00
Peter Zhu
2acd50db1c
Merge pull request #2147 from easyhaloo/pageSize_change
fix #2092 pageSize change
2019-12-19 11:45:46 +08:00
Peter Zhu
a44fa8d0d9
Merge pull request #2163 from KeRan213539/customNamespaceId
Custom namespace id
2019-12-19 11:38:18 +08:00
Peter Zhu
bf10a32a0b
Merge pull request #2149 from codeimport/develop-fuzzyget-subscriber
[ISSUE #2148] subscribers list page support fuzzy query
2019-12-19 11:35:18 +08:00
nkorange
080ca1e73d #1105 Access control finish 81% 2019-12-18 20:30:06 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
qq213539
d30f4345f3 Merge branch 'sameNamespaceClone#2171' of https://github.com/KeRan213539/nacos into sameNamespaceClone#2171 2019-12-18 14:43:07 +08:00
qq213539
6ee99aaf5a #2171 服务端部分 2019-12-18 14:41:56 +08:00
qq213539
52ceeecfa4 #2171 2019-12-18 14:41:03 +08:00
zhenxianyimeng
d457f58869 rebuild main.js and css.js 2019-12-13 10:17:57 +08:00
Peter Zhu
4029dd3d11
Merge pull request #2131 from hykjtt/develop
issue fix #2093
2019-12-12 22:47:56 +08:00
Peter Zhu
264f686d1c
Merge pull request #2142 from easyhaloo/code_optimization
refactor #2134 optimization code
2019-12-12 22:42:20 +08:00
Peter Zhu
cff83cb016
Merge pull request #2129 from lzf971107/patch-1
Update CONTRIBUTING.md
2019-12-12 22:38:38 +08:00
nkorange
2460dcddcb #1105 Access control finish 70% 2019-12-12 21:50:34 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
qq213539
b47cb1e381 sql注入修改 2019-12-12 09:26:04 +08:00
zhenxianyimeng
317ff2c0b7 fix page enter bug 2019-12-11 20:41:53 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
qq213539
592385b43e 解决魔法值问题... 2019-12-10 22:19:05 +08:00
qq213539
374b35200d #2145 增加方法注释 2019-12-10 21:42:32 +08:00
qq213539
3f5a0d0150 Merge branch 'customNamespaceId' of https://github.com/KeRan213539/nacos into customNamespaceId 2019-12-10 21:40:31 +08:00
qq213539
ed43d5c829 #2145 namespace id 为空允许新增 2019-12-10 21:39:24 +08:00
qq213539
1d42cde1b5 #2145 完善前端逻辑 2019-12-10 21:38:17 +08:00
qq213539
6703b2abbb #2145 自定义namespaceId 服务端部分 2019-12-10 21:18:56 +08:00
qq213539
866e6e386d #2145 自定义namespaceId 前端部分 2019-12-10 21:17:50 +08:00
邪影oO
1c4927fd51
Merge pull request #8 from alibaba/develop
拉代码
2019-12-10 17:02:55 +08:00
codeimport
7b31daf89b add test case 2019-12-06 19:06:12 +08:00
JianweiWang
7fab1e1d4c
Merge pull request #2153 from nkorange/client_beat_optimize
Fix #2123
2019-12-06 16:22:27 +08:00
nkorange
a32a4f780c Fix #2123 2019-12-06 15:58:23 +08:00
nkorange
38644f5e73 Fix #2020 2019-12-06 15:04:37 +08:00
nkorange
38590d060c Fix #2123 2019-12-06 11:53:01 +08:00
codeimport
c01e3e88b6 fuzzy search subscribers 2019-12-04 19:49:36 +08:00
shenggangshu
4148a1985a fix #2092 pageSize change 2019-12-04 17:03:26 +08:00
hykjtt
448120c15c issue fix #2093 2019-12-04 15:07:30 +08:00
nkorange
d150d97d0a Fix close connection exception. 2019-12-04 14:35:01 +08:00
shenggangshu
7e277ae2f1 fix #2142 CI error 2019-12-04 11:36:28 +08:00
withthewind
59b54996ad update CONTRIBUTING.md 2019-12-04 11:32:09 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
1a4c8f8af1 #1550 加测试用例 2019-11-28 15:56:29 +08:00