Commit Graph

1808 Commits

Author SHA1 Message Date
pbting
2431edae4c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 13:27:52 +08:00
nkorange
95b92b06e9 Fix #1621 2019-09-06 12:53:31 +08:00
pbting
5e7be63343 Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface 2019-09-06 12:19:53 +08:00
pbting
46bcece7aa repair speel error and add debug log 2019-09-06 12:19:16 +08:00
Fury Zhu
d1cc240397
Merge pull request #1776 from ly641921791/issue_1769
[Issue] #1769 Solve the bug of the clone configuration function
2019-09-06 10:54:47 +08:00
ly
40be568c01 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-31 10:39:42 +08:00
ly
815a339228 Merge remote-tracking branch 'upstream/develop' into issue_1769 2019-08-31 10:38:14 +08:00
ly
59a36f91e4 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-30 21:31:40 +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
ly
1fd5ee360e [Issue] #1769 Solve the bug of the clone configuration function 2019-08-29 01:23:12 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +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
pbting
ce66b46e8a resolve conflict 2019-08-16 09:58:57 +08:00
pbting
caf01308e7 add comma division with some case to use 2019-08-16 09:46:04 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
3bd5dcb1cf add comma division with some case to use 2019-08-16 09:44:06 +08:00
pbting
5222b9c407 cluster conf support multi instance inline seperator with ',' 2019-08-16 09:18:45 +08:00
pbting
be7237e8ae merge upstream develop the latest code 2019-08-15 16:48:43 +08:00
pbting
7c5b00291b Normalize http response entity with ResponseEntity by spring 2019-08-09 12:33:13 +08:00
pbting
68f170c930 repair httpGetLarge#httpGetLarge will call entity.getContentType().getElements() the contentType is NPE 2019-08-09 12:15:05 +08:00
pbting
6496ae5cd6 support datum is null case 2019-08-09 10:55:38 +08:00
pbting
f09909cd1f 1. Optimize log printing
2. Improve the robustness and readability of your code
2019-08-09 10:25:42 +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
pbting
19a5ac632c RunningConfig support get from spring.properties configuration file 2019-08-06 16:43:48 +08:00
Fury Zhu
e08e6b2796
Merge pull request #1648 from loadchange/font-privatization
Fix font privatization
2019-08-06 16:05:41 +08:00
pbting
da8e09ff4b if not set the context path with the WebServerInitializedEvent then real '/' is context path 2019-08-06 15:45:53 +08:00
pbting
25a87a8e22 Subject to the actual startup context path 2019-08-06 15:39:16 +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