Commit Graph

397 Commits

Author SHA1 Message Date
hxy1991
7bf1f2ff18 Merge branch 'upstream-develop' 2018-11-15 22:48:49 +08:00
hxy1991
7a3e9fd17b Fixes #222 2018-11-15 22:45:53 +08:00
zhichen
94fcdecc77
Merge pull request #283 from jameslcj/feature_fe_struct_optimization
Console adds eslint and prettier;  close #281 #283
2018-11-15 22:31:59 +08:00
zhichen
96736dabe1 resolve conflict 2018-11-15 22:23:20 +08:00
zhichen
e63aba6070 the fe console adds eslint and prettier #283 2018-11-15 22:18:38 +08:00
Keep
8e636df2d0
Merge pull request #274 from hxy1991/master
Fixes #272
2018-11-15 21:55:25 +08:00
王彦民
3124fb9c0e fix: closes #256 2018-11-15 21:40:40 +08:00
zhichen
2d36cae9d7 resolve conflict #281 2018-11-15 21:24:11 +08:00
zhichen
5a0dc77a73
Merge pull request #266 from jameslcj/hotfix_ListenQueryPagination
fix the bug of pagination in listeningToQuery page
2018-11-14 21:35:40 +08:00
zhichen
2f8db47768 update .eslintrc
Fix #281
2018-11-14 21:32:41 +08:00
zhichen
df631cdcd3 update .eslintrc 2018-11-14 20:52:38 +08:00
zhichen
5a811733a3 move the dir of fe to console-fe 2018-11-14 20:47:21 +08:00
zhichen
29752b1e72 upgrade the npm of husky and lint-staged 2018-11-14 19:42:35 +08:00
zhichen
6836dca96f optimize and format code by eslint and prettier 2018-11-14 19:40:42 +08:00
zhichen
48ceb4032f add eslint prettier 2018-11-14 19:38:13 +08:00
hxy1991
de4a523318 Fixes #272 2018-11-14 12:02:19 +08:00
zhichen
d866a62050 build js 2018-11-12 22:10:56 +08:00
zhichen
29c4f8d816 fix listeningToQuery pagination #259 2018-11-12 22:07:43 +08:00
zhichen
746035c11a
Merge pull request #262 from wfnuser/fix/validate_group_and_dataId_not_empty
[ISSUE #254] Add not empty validator of group and dataId in both historical version and listener query page.
2018-11-12 16:46:50 +08:00
wfnuser
a15c812b4d validate group and dataId not empty 2018-11-12 15:36:40 +08:00
yanlinly
30919083e8
Merge pull request #247 from hxy1991/master
[ISSUE #222] [ISSUE #231] [ISSUE #246]
2018-11-12 10:49:32 +08:00
Fury Zhu
724ced4861
Merge pull request #213 from paderlol/develop
Fixes #193
2018-11-11 23:08:01 +08:00
zhanglong
d60c03edcd support domain for server cluster into k8s 2018-11-11 15:15:09 +08:00
hxy1991
cc9fa1f19c Fixes #222 2018-11-09 15:30:17 +08:00
hxy1991
2ded3cf2bd Fixes #246 2018-11-08 15:39:07 +08:00
hxy1991
915f984024 Merge branch 'upstream-develop' 2018-11-08 15:38:39 +08:00
Keep
cb4e863c54
Merge pull request #245 from alibaba/master
Merge branch 'master' into develop
2018-11-08 15:14:56 +08:00
yangyshdan
4c80ac2e8a
Update README.md
#166
2018-11-07 20:53:12 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
water.lyl
dcddd2c5d4 Fix #228 build js 2018-11-07 13:16:21 +08:00
Fury Zhu
d5eeb2f351
Merge pull request #228 from loadchange/hotfix_fe_rollback_service_list
FE rollback, service list
2018-11-07 10:46:05 +08:00
王彦民
5213dbea01 fix: fe rollback, service list 2018-11-07 10:35:24 +08:00
Fury Zhu
bdc3026798
Merge pull request #198 from alibaba/hotfix_update_service_error
Fix #197
2018-11-07 10:11:42 +08:00
Asa
d6f8b1b043
Merge pull request #226 from loadchange/hotfix_fe_rollback_service_list
fix: fe rollback, service list
2018-11-07 10:09:26 +08:00
王彦民
7b77ff6471 fix: fe rollback, service list 2018-11-07 10:06:22 +08:00
Fury Zhu
3cbcbe94c0
Merge pull request #220 from nanamikon/master
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
2018-11-06 11:42:27 +08:00
yanlinly
f1d0ec4c0d
Merge pull request #221 from alibaba/develop
Release 0.4.0
2018-11-05 21:46:24 +08:00
yanlinly
9369f1819d
Merge branch 'master' into develop 2018-11-05 21:03:22 +08:00
yangyshdan
01a25eac47 Complementary fix for #166 2018-11-05 20:44:58 +08:00
yanlinly
608104c993
Merge pull request #212 from hxy1991/master
Fixes #92
2018-11-05 20:44:22 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
hxy1991
72b298e872 Fixes #196 2018-11-05 20:29:45 +08:00
hxy1991
d347a1456e Merge branch 'upstream-develop' 2018-11-05 20:29:13 +08:00
water.lyl
b94e6fe6cd Fix #179 2018-11-05 19:40:06 +08:00
yangyshdan
8c9f24cefc Update readme.md for more related project repository information 2018-11-05 19:40:05 +08:00
yangyshdan
e62d2bf457 Solve #166 2018-11-05 19:38:32 +08:00
hxy1991
adc7ecfe48 Merge branch 'upstream-develop' 2018-11-05 18:29:23 +08:00
kaitai.zj
1a4c0e0550 bug fix: The key in the com.alibaba.nacos.api.naming.pojo.Cluster is "useIPPort4Check" instead of "userIPPort4Check" 2018-11-05 18:20:23 +08:00
yangyshdan
54f67c8906 Merge branch 'develop' of https://github.com/alibaba/nacos 2018-11-05 18:15:48 +08:00
Asa
61678e2f52
Merge pull request #218 from loadchange/feature_console_create_service
Fix a bug in PR #211
2018-11-05 18:08:44 +08:00