Commit Graph

506 Commits

Author SHA1 Message Date
wfnuser
9d8db9799d remove the unexpected padding of editor. 2018-11-29 15:11:43 +08:00
wfnuser
01a067be42 remove balloons in configuration management page 2018-11-29 15:11:43 +08:00
Fury Zhu
79745783e9
Merge pull request #361 from alibaba/hotfix_decide_leader_bug
Fix #357
2018-11-28 17:38:35 +08:00
nkorange
44cb206794 Fix #357 2018-11-28 15:47:21 +08:00
Keep
ccea92e634
Merge pull request #340 from liaozan/patch-1
fix typo
2018-11-24 20:17:55 +08:00
liaozan
98ec99d84d
fix typo 2018-11-24 13:16:38 +08:00
zhichen
953dc5e32e
Merge pull request #331 from jameslcj/feature_compress_js
removed redundant js and css
2018-11-23 11:19:31 +08:00
Fury Zhu
2be8c3984a
Merge pull request #330 from ethonchen/develop
[ISSUE #325] Fix localhostIp error when set -Dnacos.preferHostnameOverIp=true
2018-11-22 20:52:02 +08:00
zhichen
5f4e149b00 remove redundant js 2018-11-22 14:29:48 +08:00
zhichen
c077c385f0 rewrite url #321 2018-11-21 17:47:01 +08:00
ethon
fb1cf6fcec bugfix, when -Dnacos.preferHostnameOverIp=true , the localhostIp error . bug #325 2018-11-21 17:33:00 +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