Fury Zhu
|
caba884069
|
Merge pull request #1624 from KeRan213539/#1583_bug_fix
#1583 bug fix
|
2019-09-19 16:57:05 +08:00 |
|
Fury Zhu
|
117eb6630f
|
Merge pull request #1792 from loadchange/issues/1759
fix: closes #1759
|
2019-09-17 14:36:42 +08:00 |
|
LoadChange
|
519c2c0450
|
fix: closes #1759
|
2019-09-02 11:36:45 +08:00 |
|
pbting
|
17ab94dba8
|
Merge branch 'develop' into feature_enhance_interface
|
2019-08-28 18:19:01 +08:00 |
|
Yangkai.Shen
|
a1da8c121e
|
🐛 remove server.contextPath
|
2019-08-23 14:06:27 +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
|
be7237e8ae
|
merge upstream develop the latest code
|
2019-08-15 16:48:43 +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 |
|
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 |
|
赵禹光
|
6ecabd70e7
|
reverse Service Name and Group Name
|
2019-08-01 21:37:26 +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 |
|
赵禹光
|
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 |
|
yanlinly
|
ebca6772bd
|
Merge pull request #1547 from wfnuser/develop
feat: support update password api
|
2019-08-01 10:31:36 +08:00 |
|
赵禹光
|
289ef2a907
|
npm build
|
2019-07-31 21:06:24 +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 |
|
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 |
|
赵禹光
|
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 |
|
keran
|
74694ede6e
|
修复#1583
|
2019-07-30 13:56:12 +08:00 |
|
wfnuser
|
486ef1e6f2
|
feat: support change password
|
2019-07-28 15:20:29 +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 |
|
赵禹光
|
038a50d478
|
WIP
|
2019-07-20 14:16:59 +08:00 |
|
wfnuser
|
c5aec4c227
|
feat: support update password api
|
2019-07-14 22:28:34 +08:00 |
|
LoadChange
|
5d019cb55e
|
fix: closes #1521
|
2019-07-14 17:00:53 +08:00 |
|
赵禹光
|
511e134ec5
|
fix1479
|
2019-07-13 12:43:01 +08:00 |
|
赵禹光
|
7d0aebccbc
|
fix 1541
|
2019-07-12 23:38:35 +08:00 |
|
ly
|
a87f0bd2bb
|
Fix #1519 The subscriber list is not displayed correctly
|
2019-07-11 01:48:11 +08:00 |
|
keran
|
ff7d683d24
|
多选删除前端部分
|
2019-07-09 17:25:57 +08:00 |
|
nkorange
|
7ddaf19106
|
Build console
|
2019-07-09 14:46:25 +08:00 |
|
keran
|
551f64ba84
|
导出查询结果增加dataId条件
|
2019-07-09 13:38:28 +08:00 |
|