nkorange
|
4c78ec2135
|
Fix conflict
|
2018-11-17 02:38:53 +08:00 |
|
zhichen
|
bf57c74603
|
Merge pull request #298 from loadchange/develop
Fixes #256，#177，#168
|
2018-11-16 21:00:51 +08:00 |
|
王彦民
|
3d91d03383
|
docs: 补充npm 安装、运行和构建说明
|
2018-11-16 20:45:43 +08:00 |
|
nkorange
|
b99833cb50
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-11-16 20:34:44 +08:00 |
|
nkorange
|
c7100e25f8
|
Fix conflict
|
2018-11-16 20:33:05 +08:00 |
|
xuechaos
|
7b38731f54
|
feature : Maven build project Support JDK 11
issue #302
|
2018-11-16 19:59:27 +08:00 |
|
nkorange
|
93246b3ded
|
Merge branch 'naming-model-refactor' into develop
# Conflicts:
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
# naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2018-11-16 19:59:15 +08:00 |
|
nkorange
|
57f2ae4eca
|
Update version
|
2018-11-16 19:41:19 +08:00 |
|
Fury Zhu
|
df9f4a7d2f
|
Merge pull request #299 from alibaba/revert-295-naming-model-refactor
Revert "Naming model refactor"
|
2018-11-16 18:22:53 +08:00 |
|
Fury Zhu
|
c3bbf7b87d
|
Revert "Naming model refactor"
|
2018-11-16 18:22:13 +08:00 |
|
Fury Zhu
|
5f0a1286ba
|
Merge pull request #295 from alibaba/naming-model-refactor
Naming model refactor
|
2018-11-16 18:17:48 +08:00 |
|
Fury Zhu
|
ea03905ae9
|
Merge branch 'master' into naming-model-refactor
|
2018-11-16 18:16:51 +08:00 |
|
yangyshdan
|
d57164a5d7
|
Update README.md
#166
|
2018-11-16 16:17:35 +08:00 |
|
王彦民
|
76f760bbba
|
merge
|
2018-11-16 15:10:55 +08:00 |
|
nkorange
|
8df5e5e328
|
Fix test case error
|
2018-11-16 15:01:32 +08:00 |
|
王彦民
|
0a4ed295a2
|
fix: closes #256, #177, #168
|
2018-11-16 14:58:14 +08:00 |
|
王彦民
|
9348ef49b1
|
fix: closes #256, #177, #168
|
2018-11-16 14:55:52 +08:00 |
|
xuechaos
|
0f51707171
|
fix maven-surefire-plugin args support jdk 1.8
|
2018-11-16 14:42:45 +08:00 |
|
xuechaos
|
b6e1ad91b8
|
feature : Support JDK 11
issue #214
|
2018-11-16 14:22:12 +08:00 |
|
yangyshdan
|
db12703448
|
Update CONTRIBUTING.md
#166
|
2018-11-16 12:28:54 +08:00 |
|
nkorange
|
46c141900e
|
Fix PMD
|
2018-11-16 12:07:25 +08:00 |
|
Keep
|
c00f796ae8
|
Merge pull request #293 from jameslcj/feature_format_fe_code
format the third libs
|
2018-11-16 11:11:09 +08:00 |
|
zhichen
|
3b4c6df1b8
|
Merge branch 'develop' into feature_format_fe_code
|
2018-11-16 10:56:36 +08:00 |
|
xxc
|
b0779383b4
|
Merge pull request #288 from hxy1991/master
Fixes #222
|
2018-11-16 10:54:34 +08:00 |
|
zhichen
|
17a7aaaa96
|
format the third libs
|
2018-11-16 10:46:52 +08:00 |
|
hxy1991
|
af21897608
|
correct license
|
2018-11-16 10:28:28 +08:00 |
|
lingwei.clw
|
625f3a9159
|
新增自动注销和自动注册测试用例
|
2018-11-16 10:02:48 +08:00 |
|
hxy1991
|
c6a32e5357
|
Fixes "unapproved license" issue
|
2018-11-16 00:29:41 +08:00 |
|
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 |
|
nkorange
|
f15d818e74
|
Fix test case error
|
2018-11-15 20:16:36 +08:00 |
|
nkorange
|
eba3ca9c74
|
Fix ip registered failed bug
|
2018-11-15 15:25:45 +08:00 |
|
nkorange
|
361ae0b2dd
|
Fix raft publish bug
|
2018-11-15 14:19:08 +08:00 |
|
yangyshdan
|
e5bea8d5be
|
Update README.md
#166
|
2018-11-14 22:29:13 +08:00 |
|
yangyshdan
|
eb3ff61f67
|
Update README.md
#166
|
2018-11-14 22:28:07 +08:00 |
|
yangyshdan
|
5b4500c52b
|
Update README.md
#166
|
2018-11-14 22:27:04 +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 |
|
yangyshdan
|
dfb551edbc
|
Update README.md
#166
|
2018-11-14 15:34:16 +08:00 |
|