Commit Graph

327 Commits

Author SHA1 Message Date
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
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
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
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
nkorange
855037cac6 Fix client side health check error 2018-10-25 13:22:22 +08:00
hxy1991
c854236a8e fixes #92 2018-10-24 19:53:28 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
nkorange
e3276d0114 Fix #150 2018-10-24 17:52:55 +08:00
王彦民
0ab5bf946d fix: ServiceDetail page table column fixed width 2018-10-24 11:31:37 +08:00
wyp12
4da7557620 add enable 2018-10-24 11:17:47 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
water.lyl
2e36f7f397 [motify info] release ui file 2018-10-20 08:30:53 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
xxc
b87efc470e
Merge pull request #140 from alibaba/0.3.0
0.3.0
2018-10-19 17:24:29 +08:00
nkorange
c63f5899f6 Fix #139 2018-10-19 16:55:44 +08:00
Keep
b09179bed2
Merge pull request #137 from hxy1991/master
update pom.xml for release client jar
2018-10-19 16:11:41 +08:00
xxc
994a508a91
notifications add mw_configcenter
- mw_configcenter@list.alibaba-inc.com
2018-10-19 16:09:21 +08:00
hxy1991
43452229bf update pom.xml for release client jar 2018-10-19 15:41:47 +08:00
小马哥
72cec826cb
Merge pull request #136 from mercyblitz/0.3.0
Fixed test cases
2018-10-19 11:33:47 +08:00
mercyblitz
66a3930a4d Fixed test cases 2018-10-19 11:32:09 +08:00
小马哥
a41c173275
Merge pull request #135 from mercyblitz/0.3.0
Add Default properties
2018-10-19 11:22:54 +08:00
mercyblitz
a826288f9c Add server.servlet.contextPath=/nacos 2018-10-19 11:18:17 +08:00
mercyblitz
cc616f8d6d Revert Constants.java & testcase 2018-10-19 11:00:37 +08:00
小马哥
b64a0ba9c0
Merge pull request #134 from mercyblitz/0.3.0
0.3.0
2018-10-19 10:53:31 +08:00