nkorange
|
6da8bf89fc
|
Resolve conflicts and fix log error
|
2018-10-18 22:23:26 +08:00 |
|
nkorange
|
faae4161a6
|
Merge remote-tracking branch 'origin/0.3.0' into 0.3.0
|
2018-10-18 19:01:16 +08:00 |
|
nkorange
|
534995a405
|
Resolve conflicts
|
2018-10-18 18:59:45 +08:00 |
|
zhichen
|
1fdd763b8d
|
fix pageSize bug
|
2018-10-18 17:16:32 +08:00 |
|
nkorange
|
baa8594fe7
|
Merge branch 'master' into 0.3.0
# Conflicts:
# api/pom.xml
# config/pom.xml
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
# console/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# naming/src/main/resources/application.properties
|
2018-10-18 17:11:32 +08:00 |
|
王彦民
|
4ae610d2cc
|
Merge branch '0.3.0' of github.com:alibaba/nacos into 0.3.0
|
2018-10-18 14:27:30 +08:00 |
|
王彦民
|
cc4dc419f6
|
fix: Service Detail i18n
|
2018-10-18 14:26:53 +08:00 |
|
王彦民
|
1441561ae3
|
fix: Service Detail i18n
|
2018-10-18 14:26:05 +08:00 |
|
zhichen
|
5430de8565
|
Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0
|
2018-10-18 14:10:25 +08:00 |
|
zhichen
|
9d6e57af5c
|
fix ConfigEditor bugs
|
2018-10-18 14:10:18 +08:00 |
|
water.lyl
|
d4a5fb2bd1
|
[motify info] fix dataId cannot show problem
|
2018-10-18 12:46:56 +08:00 |
|
nkorange
|
96abf18b41
|
Fix health check disabled bug
|
2018-10-18 10:28:50 +08:00 |
|
Fury Zhu
|
1571945446
|
Merge pull request #127 from aCoder2013/fix-serverlist-check
Fix potential NPE
|
2018-10-18 10:00:24 +08:00 |
|
nkorange
|
0c034d5ee3
|
Fix health check is disabled bug
|
2018-10-17 20:26:15 +08:00 |
|
nkorange
|
f1b3e7d82d
|
Optimize log display
|
2018-10-17 19:49:01 +08:00 |
|
nkorange
|
698cf480e0
|
Fix #130
|
2018-10-17 18:12:39 +08:00 |
|
小马哥
|
ab23965474
|
Merge pull request #129 from mercyblitz/master
Fixed test cases
|
2018-10-17 16:40:28 +08:00 |
|
mercyblitz
|
8f7c743a00
|
Fixed test cases
|
2018-10-17 16:39:12 +08:00 |
|
nkorange
|
5374e89417
|
Merge remote-tracking branch 'origin/0.3.0' into 0.3.0
|
2018-10-17 16:21:43 +08:00 |
|
nkorange
|
504edb141b
|
Add metadata test case
|
2018-10-17 16:21:33 +08:00 |
|
zhichen
|
dd4e87f35a
|
Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0
|
2018-10-17 15:13:11 +08:00 |
|
zhichen
|
9c6b1dec4f
|
modify the architecture of pages and components
|
2018-10-17 15:11:59 +08:00 |
|
nkorange
|
eb43978f86
|
Merge remote-tracking branch 'origin/0.3.0' into 0.3.0
|
2018-10-17 14:51:59 +08:00 |
|
nkorange
|
7eaafd754d
|
Fix health check incorrect bug
|
2018-10-17 14:51:24 +08:00 |
|
zhichen
|
01918ec9e5
|
Fixes #128
|
2018-10-17 11:16:37 +08:00 |
|
nkorange
|
fb84f039fb
|
Fix service detail page error
|
2018-10-16 21:45:48 +08:00 |
|
aCoder2013
|
a11d205fce
|
Fix potential NPE
|
2018-10-16 21:07:55 +08:00 |
|
nkorange
|
e8c81e24ed
|
Modify page display
|
2018-10-16 17:28:19 +08:00 |
|
hanxie
|
d3f59f3b87
|
Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0
# Conflicts:
# console/src/main/resources/static/src/menu.js
|
2018-10-16 14:23:01 +08:00 |
|
hanxie
|
92148babe7
|
fix navlist
|
2018-10-16 14:19:09 +08:00 |
|
nkorange
|
22d81e05ef
|
Fix cluster name value incorrect bug.
|
2018-10-15 22:59:24 +08:00 |
|
LoadChange
|
bf285912dc
|
fix: metadata to text bug
|
2018-10-15 21:18:23 +08:00 |
|
nkorange
|
2be5171cf2
|
Fix service list page index error
|
2018-10-15 20:20:59 +08:00 |
|
nkorange
|
216007ff97
|
Fix update metadata failed bug, modify health status display words
|
2018-10-15 20:16:55 +08:00 |
|
王彦民
|
c824b2a463
|
fix: cluster update API to add parameters
|
2018-10-15 18:04:04 +08:00 |
|
小马哥
|
018a6e017a
|
Merge pull request #125 from mercyblitz/master
Polish to resolve compilation issue
|
2018-10-15 17:20:57 +08:00 |
|
mercyblitz
|
c0ee2f2764
|
Polish to resolve compilation issue
|
2018-10-15 17:17:25 +08:00 |
|
小马哥
|
e05bc7a682
|
Merge pull request #124 from alibaba/0.2.2
0.2.2
|
2018-10-15 17:10:57 +08:00 |
|
小马哥
|
5c3ebf8f9f
|
Merge branch 'master' into 0.2.2
|
2018-10-15 17:10:48 +08:00 |
|
王彦民
|
9d527c3810
|
fix: Add the return button to the Service Detail page
|
2018-10-15 11:05:45 +08:00 |
|
王彦民
|
0e2e59c2e0
|
fix: Health check pattern Key/Value
|
2018-10-14 21:26:29 +08:00 |
|
王彦民
|
a95ac5179e
|
feat: Service Detail page API docking
|
2018-10-14 17:41:16 +08:00 |
|
nkorange
|
71cf53361f
|
Fix test failed bug
|
2018-10-14 12:07:50 +08:00 |
|
nkorange
|
712c0216d0
|
Make parameter 'enable' optional
|
2018-10-14 11:16:22 +08:00 |
|
nkorange
|
78277f9413
|
front page commit
|
2018-10-13 12:22:02 +08:00 |
|
nkorange
|
2ffeb256d3
|
Support update instance and query instance list
|
2018-10-13 12:19:10 +08:00 |
|
王彦民
|
5ba7a5c492
|
fix: Fix Instance list display
|
2018-10-12 23:43:58 +08:00 |
|
王彦民
|
2f4616aaa5
|
feat: Service details page API docking
|
2018-10-12 20:28:53 +08:00 |
|
dungu.zpf
|
86d8c7a4c4
|
fix #121 and refactor health check model
|
2018-10-11 16:11:48 +08:00 |
|
Keep
|
82075cd136
|
Merge pull request #118 from mingyixu/master
add open api testcases
|
2018-10-11 11:41:42 +08:00 |
|