Commit Graph

1790 Commits

Author SHA1 Message Date
universefeeler
54ae846cb7 improve(instanceHealth): add update logic 2019-09-10 15:53:26 +08:00
universefeeler
f95215f218 chore(triggerFlag): adjust some details 2019-09-09 21:25:38 +08:00
universefeeler
935918ed9e improve(triggerFlag): add pre check for triggerFlag 2019-09-09 20:24:59 +08:00
universefeeler
5681ca3f78 feture(triggerFlag): add frontend show triggerFlag 2019-09-09 15:13:24 +08:00
universefeeler
7f0bcaa5cb feature(triggerFlag): add triggerFlag for service 2019-09-09 10:48:11 +08:00
Fury Zhu
0808d0cc39
Merge pull request #1754 from xkcoding/develop
[ISSUE #1753] Remove [nacos-console] server.contextPath
2019-08-30 10:58:21 +08:00
Fury Zhu
5f990729be
Merge pull request #1765 from beldon/develop
fix #1764.
2019-08-30 10:17:36 +08:00
Fury Zhu
548354e77b
Merge branch 'develop' into develop 2019-08-30 10:17:20 +08:00
nkorange
4459dc73b9 Fix #1764 2019-08-30 10:15:38 +08:00
Beldon
bbad9d69b0 fix #1764. 2019-08-25 20:23:05 +08:00
Yangkai.Shen
a1da8c121e 🐛 remove server.contextPath 2019-08-23 14:06:27 +08:00
Fury Zhu
756095dba7
Merge pull request #1543 from zhaoyuguang/zen5
Fix 1541
2019-08-22 16:46:58 +08:00
赵禹光
ea924e8b14 use API to create param 2019-08-22 11:03:47 +08:00
赵禹光
5b3690b823 use API to create param 2019-08-22 10:54:05 +08:00
赵禹光
d3fd616626 页面修复 2019-08-21 16:50:50 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5
# Conflicts:
#	console/src/main/resources/static/js/main.js
2019-08-21 16:49:48 +08:00
nkorange
48ff738511 Use dynamic server version 2019-08-08 11:44:03 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
Fury Zhu
e08e6b2796
Merge pull request #1648 from loadchange/font-privatization
Fix font privatization
2019-08-06 16:05:41 +08:00
LoadChange
fdcd2f32ee fix: font privatization 2019-08-05 17:50:45 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
nkorange
d6c5a76dd1 Fix bug 2019-08-02 12:32:11 +08:00
赵禹光
6ecabd70e7 reverse Service Name and Group Name 2019-08-01 21:37:26 +08:00
赵禹光
3085bcf67e Unified constant use 2019-08-01 21:00:24 +08:00
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
赵禹光
408b36307d Delete the code that caused the list multi-element 2019-08-01 20:30:10 +08:00
赵禹光
d9d79dd21c Remove unnecessary code 2019-08-01 20:28:33 +08:00
赵禹光
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
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