ly
|
11b1d5128e
|
Merge remote-tracking branch 'upstream/develop' into issue_1671
|
2019-08-23 00:41:51 +08:00 |
|
ly
|
3b4767384d
|
[ISSUE] #1671 Unified request header "Client-Version"
|
2019-08-23 00:02:00 +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 |
|
ezlippi.ouyang
|
210f77ee6c
|
fix: fix #1733
|
2019-08-21 13:10:13 +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 |
|
chuntaojun
|
2802247d6c
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2019-08-13 21:41:30 +08:00 |
|
chuntaojun
|
e981f3f787
|
feat:
|
2019-08-13 21:41:26 +08:00 |
|
fox
|
e2bd58697e
|
Merge pull request #1 from alibaba/master
更新nacos代码
|
2019-08-13 14:26:02 +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 |
|
Fury Zhu
|
6920baf49a
|
Merge pull request #1655 from alibaba/develop
Release 1.1.3
|
2019-08-07 14:42:09 +08:00 |
|
Thomas Perkins
|
934c4238c1
|
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
These tests were written using Diffblue Cover
|
2019-08-06 17:15:01 +01: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 |
|
赵禹光
|
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 |
|