Commit Graph

348 Commits

Author SHA1 Message Date
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
hxy1991
adc7ecfe48 Merge branch 'upstream-develop' 2018-11-05 18:29:23 +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
王彦民
5cc9ca9b7c fix: Delete refresh table 2018-11-05 17:32:10 +08:00
yanlinly
6d0eb73d46
Merge pull request #217 from yanlinly/master
Fix #216
2018-11-05 15:57:01 +08:00
water.lyl
db8e97bd35 Fix #216 2018-11-05 15:45:36 +08:00
zhichen
56e2251612
Merge pull request #211 from loadchange/feature_console_create_service
#177 Finish EF
2018-11-04 14:31:22 +08:00
hxy1991
53147b3420 Fixes #210 2018-11-02 18:44:57 +08:00
hxy1991
7c626eb4f8 Fixes #92 2018-11-02 18:26:24 +08:00
zhichen
2181ff170c build js 2018-11-02 17:03:21 +08:00
王彦民
f462f46706 #177 Finish EF 2018-11-02 10:38:43 +08:00
yanlinly
6cddbc6b00
Merge pull request #201 from yanlinly/master
Fix #200
2018-10-31 22:22:03 +08:00
water.lyl
224aecf6c7 Fix #200 timeout should be 5 2018-10-31 22:18:48 +08:00
water.lyl
8a7d313771 Fix #200 2018-10-31 22:17:02 +08:00
nkorange
6e3f2ba31a Merge branch 'master' into develop 2018-10-31 15:42:23 +08:00
xxc
eab2110033
Merge pull request #192 from alibaba/hotfix-clientbeat-lose-info
Fix #190
2018-10-31 15:30:17 +08:00
xxc
1a94626a0a
Merge pull request #184 from alibaba/hotfix-register-hangs
Fix #150
2018-10-31 15:23:43 +08:00
yanlinly
fa54918da1
Merge pull request #2 from alibaba/develop
Develop
2018-10-31 10:02:29 +08:00
yanlinly
0add80d700
Merge pull request #183 from jameslcj/feature_fe_module_gloablLib
modulize the global params of fe
2018-10-31 09:43:50 +08:00
yanlinly
24a2ede65f
Merge pull request #194 from yanlinly/master
Fix #38 #106 #188
2018-10-31 09:39:22 +08:00
Keep
ede4111300
Merge pull request #152 from hxy1991/master
fixes #92
2018-10-30 21:16:09 +08:00
nkorange
dc7cb2bdee Fix #190 2018-10-30 17:59:05 +08:00
water.lyl
563105ae4f Fix #106 2018-10-30 17:52:01 +08:00
water.lyl
9d70f720ca Fix #188 2018-10-30 15:55:06 +08:00
water.lyl
70651a89a7 Fix #38 2018-10-30 11:06:55 +08:00
nkorange
ebb5cddd84 Not remove lock 2018-10-29 22:34:44 +08:00
nkorange
25f219623c Fix #150 2018-10-29 21:25:53 +08:00
zhichen
4cf9ca0998 modulize the global params of fe 2018-10-29 17:48:14 +08:00
yanlinly
b0a69c4479
Merge pull request #1 from alibaba/develop
Develop
2018-10-29 16:53:47 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xxc
04a4f3555b
Merge pull request #178 from alibaba/0.3.0
0.3.0
2018-10-26 21:39:04 +08:00
xuechaos
c32fbd9f65 update lisence header 2018-10-26 21:02:33 +08:00
xuechaos
1583369a7b 0.3 merge master 2018-10-26 20:32:04 +08:00
xuechaos
2a2a53398f Merge branch 'master' into 0.3
# Conflicts:
#	console/src/main/resources/static/i18ndoc.js
#	console/src/main/resources/static/index.js
2018-10-26 20:27:33 +08:00
water.lyl
82781bbbe3 Fix #171
build js
2018-10-26 19:26:16 +08:00
zhichen
b97d0b4b69 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-10-26 18:57:08 +08:00
zhichen
91cc27a0cc fix #171 2018-10-26 18:56:30 +08:00
xxc
4ea44f5ce5
Merge pull request #151 from alibaba/hotfix-clientbeat-failed
Hotfix clientbeat failed
2018-10-26 18:45:57 +08:00
water.lyl
e226b5e198 Fix #145 2018-10-26 18:05:33 +08:00
zhichen
c8804a5205 static cdn fix#155 2018-10-26 17:03:26 +08:00
water.lyl
acfac48828 Fix #142
group show
2018-10-26 14:32:01 +08:00
water.lyl
90e5c956cb # fix 156
Slove 404 problem
2018-10-26 14:03:16 +08:00
xuechaos
c1c37d3d6c update travis 2018-10-25 19:06:03 +08:00
xuechaos
0c67a2a17c update travis ci 2018-10-25 19:04:49 +08:00
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
zhichen
f9959e1f02 remove 404 request #156 2018-10-25 14:11:31 +08:00