Commit Graph

496 Commits

Author SHA1 Message Date
zhichen
c077c385f0 rewrite url #321 2018-11-21 17:47:01 +08:00
zhichen
46648dbdce
[ISSUE 321]Merge pull request #324 from jameslcj/hotfix_321
fix #321
2018-11-21 13:57:41 +08:00
zhichen
7d0bef5342 fix #321 2018-11-21 11:25:19 +08:00
zhichen
d958bd60e3
Merge pull request #319 from jameslcj/feature_console_add_webpack_hot
webpack adds hot dev mode
2018-11-20 16:30:56 +08:00
zhichen
227a5154fe udpate: add some fe files to rat config 2018-11-20 15:18:29 +08:00
Keep
5f5a520b95
Merge pull request #318 from alibaba/master
Merge branch 'master' into develop
2018-11-20 15:14:43 +08:00
zhichen
646e5bf9fa feature: webpack adds hot dev mode 2018-11-20 14:39:46 +08:00
Keep
9fafcda744
Merge pull request #317 from hxy1991/hotfix_316
Fixes #316
2018-11-20 14:39:29 +08:00
hxy1991
0e24b70642 Fixes #316 2018-11-20 14:22:41 +08:00
xxc
2dacfd69c0
Merge pull request #315 from alibaba/hotfix_gclog
fix : GC log does not take effect
2018-11-20 11:52:50 +08:00
xuechaos
dc8d44597f fix : GC log does not take effect
issue ##314
2018-11-20 11:03:25 +08:00
zhichen
84b9dd6e77
[issues #294]Merge pull request #305
FE Scaffold reconstruction, #294
2018-11-20 09:58:38 +08:00
Fury Zhu
75309260eb
Merge pull request #313 from alibaba/hotfix_hide_mvnrepo
Hotfix hide mvnrepo
2018-11-20 09:15:08 +08:00
Fury Zhu
fb363d9ba6
Merge pull request #312 from alibaba/hotfix_hide_mvnrepo
Hide mvn repository config
2018-11-20 09:13:24 +08:00
nkorange
62352515d9 Hide mvn repository config 2018-11-20 09:12:20 +08:00
Fury Zhu
0fb3f9562e
Merge pull request #311 from alibaba/develop
0.5.0 release
2018-11-19 19:59:41 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
Fury Zhu
e773ef26a5
Merge pull request #309 from alibaba/develop
Develop
2018-11-19 17:38:40 +08:00
JianweiWang
2a41553913
Merge pull request #308 from alibaba/hotfix_log_print
Hotfix log print
2018-11-19 17:29:07 +08:00
nkorange
807c7dc153 Fix raft publish unstable problem. 2018-11-19 16:58:19 +08:00
nkorange
3a6eafc4a1 Fix #172 2018-11-19 16:56:36 +08:00
王彦民
1a85a76e39 refactor: Add alibaba copyright, Clean up useless files 2018-11-19 15:13:48 +08:00
王彦民
a1f6974690 refactor: Add redux, ConfigProvider 2018-11-18 23:17:22 +08:00
王彦民
f8b03c321a refactor: 脚手架重构 2018-11-18 13:58:33 +08:00
yanlinly
f4ee668de2
Merge pull request #304 from alibaba/develop
release 0.5.0
2018-11-17 18:15:59 +08:00
nkorange
d42e8ac621 Merge branch 'master-test3' into develop 2018-11-17 02:53:30 +08:00
nkorange
b26deb85b4 Add missing files 2018-11-17 02:48:07 +08:00
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