赵禹光
|
8d2711ae60
|
revert error code
|
2019-08-01 20:26:23 +08:00 |
|
赵禹光
|
87850d46b8
|
Merge commit 'df82ed3c296b12c3731badc40b1f881e5f1c183b' into zen5
# Conflicts:
# console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
# console/src/main/resources/static/js/main.js
# naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
|
2019-08-01 19:55:10 +08:00 |
|
nkorange
|
df82ed3c29
|
build console
|
2019-08-01 15:58:10 +08:00 |
|
Fury Zhu
|
bf3e822d5b
|
Merge pull request #1576 from zhaoyuguang/fix-1535-1
FIX close: 1535 Add a button to hide the empty service on console at service list page
|
2019-08-01 15:52:25 +08:00 |
|
赵禹光
|
9745e87079
|
clear code
|
2019-08-01 15:38:05 +08:00 |
|
rushsky518
|
192610b4c9
|
#1507 close server from current dir
|
2019-08-01 15:25:25 +08:00 |
|
Fury Zhu
|
2be84834e9
|
Merge pull request #1633 from zhaoyuguang/fix-ci
FIX CI UN Build
|
2019-08-01 15:22:31 +08:00 |
|
赵禹光
|
50fb50e6a1
|
no message
|
2019-08-01 12:33:29 +08:00 |
|
赵禹光
|
a5b67493e8
|
Merge commit '838ef83f9f19d25a9f29c808d77d7ea4a6854ee2' into fix-1535-1
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
|
2019-08-01 11:16:43 +08:00 |
|
赵禹光
|
20c73a108d
|
remove unness const
|
2019-08-01 11:14:57 +08:00 |
|
赵禹光
|
f6007660b8
|
add refresh memory
|
2019-08-01 11:13:27 +08:00 |
|
Fury Zhu
|
838ef83f9f
|
Merge pull request #1534 from zhaoyuguang/zen3
format code
|
2019-08-01 11:04:24 +08:00 |
|
Fury Zhu
|
9b2367eb91
|
Merge pull request #1552 from nkorange/hotfix_log_optimization
Fix #290
|
2019-08-01 11:02:55 +08:00 |
|
Fury Zhu
|
0a08be2b96
|
Merge pull request #1630 from alibaba/feature_enhance_interface
upgrade fastjson version and Optimizing Some interfaces
|
2019-08-01 11:00:55 +08:00 |
|
yanlinly
|
ebca6772bd
|
Merge pull request #1547 from wfnuser/develop
feat: support update password api
|
2019-08-01 10:31:36 +08:00 |
|
赵禹光
|
cc27d67ef9
|
没有过滤条件直接返回原始Service列表
|
2019-08-01 09:33:49 +08:00 |
|
赵禹光
|
22b0ed7cc0
|
fix CI
|
2019-07-31 21:09:21 +08:00 |
|
赵禹光
|
289ef2a907
|
npm build
|
2019-07-31 21:06:24 +08:00 |
|
赵禹光
|
ee0c469471
|
后端支持
|
2019-07-31 21:03:49 +08:00 |
|
赵禹光
|
b10402a6a8
|
fix FE
|
2019-07-31 20:41:39 +08:00 |
|
赵禹光
|
ce222f199f
|
fix build
|
2019-07-31 18:48:05 +08:00 |
|
赵禹光
|
0a54af1179
|
Merge commit '32c29149590022c335d8f64c6903a82619fd1bc9' into fix-1535-1
# Conflicts:
# console/src/main/resources/static/js/main.js
|
2019-07-31 18:40:39 +08:00 |
|
赵禹光
|
814a4b9cbe
|
no message
|
2019-07-31 18:39:42 +08:00 |
|
pbting
|
3d1cf6e092
|
Merge branch 'upstream_develop' into feature_enhance_interface
|
2019-07-31 16:25:56 +08:00 |
|
Fury Zhu
|
32c2914959
|
Merge pull request #1544 from zhaoyuguang/z_wcek_1479
Fix1479
|
2019-07-31 10:50:43 +08:00 |
|
邪影oO
|
b3e75b31d0
|
Merge branch 'develop' into #1583_bug_fix
|
2019-07-30 17:15:40 +08:00 |
|
Fury Zhu
|
b0dd759a85
|
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion
Multiple selection deletion
|
2019-07-30 17:11:40 +08:00 |
|
Fury Zhu
|
302de9c885
|
Merge pull request #1578 from loadchange/issues/1569
Fix: closes #1569
|
2019-07-30 16:47:45 +08:00 |
|
Fury Zhu
|
e5df89fde1
|
Merge pull request #1623 from nkorange/feature_forbid_invalid_namespace
Fix namespace vulnerability
|
2019-07-30 16:36:36 +08:00 |
|
Fury Zhu
|
1c68568f4d
|
Merge pull request #1587 from rushsky518/develop
distro use local time to record heartbeat
|
2019-07-30 16:35:16 +08:00 |
|
赵禹光
|
f69b0542be
|
编译 main.*
|
2019-07-30 15:50:00 +08:00 |
|
赵禹光
|
de49db7ee6
|
Merge commit 'dea95fa11af55f3da8bc6d4cfe3e1ee8842cb9ee' into zen5
# Conflicts:
# console/src/main/resources/static/css/main.css
# console/src/main/resources/static/js/main.js
|
2019-07-30 15:48:37 +08:00 |
|
Fury Zhu
|
dea95fa11a
|
Merge pull request #1525 from ly641921791/develop
Fix #1519 The subscriber list is not displayed correctly
|
2019-07-30 15:36:59 +08:00 |
|
赵禹光
|
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 |
|
Fury Zhu
|
ad5c249e7c
|
Merge pull request #1499 from chuntaojun/fix_issue_1492
feat(config): support different db name and password
|
2019-07-30 14:52:29 +08:00 |
|
Fury Zhu
|
364fa7ec02
|
Merge pull request #1501 from chuntaojun/fix_issue_1500
fix(api): fix issue #1500
|
2019-07-30 14:40:13 +08:00 |
|
keran
|
74694ede6e
|
修复#1583
|
2019-07-30 13:56:12 +08:00 |
|
nkorange
|
207e54631c
|
Fix namespace vulnerability
|
2019-07-30 00:40:21 +08:00 |
|
Fury Zhu
|
0bd1f12f86
|
Merge pull request #1592 from nkorange/hotfix_data_listener_lost
Fix #1591
|
2019-07-29 21:54:59 +08:00 |
|
pbting
|
e45546bc66
|
upgrade the fastjson version
|
2019-07-29 09:30:02 +08:00 |
|
wfnuser
|
486ef1e6f2
|
feat: support change password
|
2019-07-28 15:20:29 +08:00 |
|
nkorange
|
e5d0d66492
|
Fix #1591
|
2019-07-26 17:10:02 +08:00 |
|
nkorange
|
8d453e62a8
|
Fix #1591
|
2019-07-23 16:36:55 +08:00 |
|
rushsky518
|
e259dc34e8
|
#1529
distro 使用本地时间记录心跳
|
2019-07-22 19:24:46 +08:00 |
|
赵禹光
|
3503fe29d8
|
build main
|
2019-07-22 10:29:52 +08:00 |
|
赵禹光
|
b29c1193f1
|
Merge commit 'd1127041cf4678b8306101f108d3d463b993a9ca' into fix-1535-1
# Conflicts:
# console/src/main/resources/static/css/main.css
# console/src/main/resources/static/js/main.js
|
2019-07-22 10:22:58 +08:00 |
|
赵禹光
|
2f1d88cf8b
|
fix bug
|
2019-07-22 10:17:55 +08:00 |
|
LoadChange
|
ba1e6a2333
|
fix: closes #1569
|
2019-07-20 18:40:26 +08:00 |
|
LoadChange
|
d1127041cf
|
fix: closes #1520
|
2019-07-20 18:09:04 +08:00 |
|