nkorange
|
5e244a7316
|
#558 Add access log setting
|
2019-01-03 16:49:57 +08:00 |
|
nkorange
|
3250533516
|
#526 Make more effort
|
2018-12-29 13:44:12 +08:00 |
|
nkorange
|
6deb198e2c
|
Fix #526
|
2018-12-27 00:30:23 +08:00 |
|
nkorange
|
571031eb0c
|
Fix #527
|
2018-12-27 00:28:39 +08:00 |
|
王彦民
|
6a3370e2fd
|
refactor: ExportDialog i18n #474
|
2018-12-25 18:16:36 +08:00 |
|
王彦民
|
d6cb0423a4
|
refactor: EditorNameSpace i18n #474
|
2018-12-25 10:50:43 +08:00 |
|
Keep
|
9ccf5a14b3
|
Merge pull request #516 from paderlol/develop
Fix #512
|
2018-12-25 10:46:28 +08:00 |
|
王彦民
|
a2d6eac728
|
refactor: DiffEditorDialog, ConfigEditor i18n #474
|
2018-12-24 22:26:20 +08:00 |
|
zhanglong
|
2da6611cbc
|
Fix #512
|
2018-12-24 21:05:38 +08:00 |
|
王彦民
|
79f73ff17c
|
refactor: DeleteDialog i18n #474
|
2018-12-23 20:39:04 +08:00 |
|
王彦民
|
b6491cc25c
|
refactor: CloneDialog internationalization
|
2018-12-22 20:10:39 +08:00 |
|
Keep
|
ce32594339
|
Merge pull request #486 from hxy1991/Fixes#439
[ISSUE #439] save snapshot error
|
2018-12-20 16:44:38 +08:00 |
|
Fury Zhu
|
2cf3164307
|
Merge pull request #489 from gqxie/dev
fix some spelling mistakes
|
2018-12-19 17:40:50 +08:00 |
|
gqxie
|
a4c2ffe82a
|
fix some spelling mistakes
|
2018-12-19 16:57:27 +08:00 |
|
gqxie
|
d40ce1fbc1
|
Merge pull request #1 from alibaba/develop
更新代码
|
2018-12-19 16:48:37 +08:00 |
|
Fury Zhu
|
d0517ad499
|
Merge pull request #488 from gqxie/dev
fix a spelling mistake
|
2018-12-19 15:47:06 +08:00 |
|
gqxie
|
4420c319dd
|
fix a spelling mistake
|
2018-12-19 14:08:50 +08:00 |
|
hxy1991
|
0b65e34fd0
|
Fixes #336 #439
|
2018-12-19 10:36:59 +08:00 |
|
Fury Zhu
|
53eb990328
|
Merge pull request #485 from alibaba/master
master to develop
|
2018-12-18 20:23:18 +08:00 |
|
Fury Zhu
|
2bde25bc33
|
Merge pull request #484 from alibaba/feature_cmdb
Feature cmdb
|
2018-12-18 18:01:27 +08:00 |
|
nkorange
|
dc36c24f17
|
#187 Add debug log
|
2018-12-18 17:35:22 +08:00 |
|
nkorange
|
64f29ddd78
|
#187 Add label dump task
|
2018-12-18 16:03:26 +08:00 |
|
nkorange
|
7fac0909d4
|
Fix build error
|
2018-12-14 22:47:09 +08:00 |
|
nkorange
|
4dbfb6c1fa
|
Update version
|
2018-12-14 22:25:34 +08:00 |
|
nkorange
|
205929b50e
|
Update version in banner.txt
|
2018-12-14 22:14:10 +08:00 |
|
nkorange
|
109a196dce
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 21:15:58 +08:00 |
|
nkorange
|
2bd2ed131f
|
NPE protection
|
2018-12-14 21:08:49 +08:00 |
|
zhichen
|
fb72fa8098
|
build js
|
2018-12-14 21:05:04 +08:00 |
|
zhichen
|
8e6e6f0362
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2018-12-14 21:01:53 +08:00 |
|
zhichen
|
135056057c
|
update: the console version
|
2018-12-14 21:01:33 +08:00 |
|
nkorange
|
71f1d946fd
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:52:00 +08:00 |
|
Fury Zhu
|
d647972686
|
Merge pull request #467 from jameslcj/hotfix_393
Hotfix 393
|
2018-12-14 20:51:15 +08:00 |
|
zhichen
|
6e1074e721
|
build js
|
2018-12-14 20:49:07 +08:00 |
|
nkorange
|
b35b483e87
|
Add plugin directory
|
2018-12-14 20:48:26 +08:00 |
|
zhichen
|
805ed2325e
|
Merge branch 'develop' of https://github.com/alibaba/nacos into hotfix_393
|
2018-12-14 20:46:53 +08:00 |
|
zhichen
|
a656519794
|
change service remove url #393
|
2018-12-14 20:45:01 +08:00 |
|
nkorange
|
d3a164ca8b
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:28:23 +08:00 |
|
Fury Zhu
|
efe9d1107f
|
Merge pull request #466 from jameslcj/hotfix_393
fix request params pattern #393
|
2018-12-14 20:27:07 +08:00 |
|
nkorange
|
dc3d95d055
|
Disable CMDB by default
|
2018-12-14 20:25:53 +08:00 |
|
zhichen
|
a95f623f33
|
resolve conflict
|
2018-12-14 20:24:04 +08:00 |
|
zhichen
|
fd3d3d8491
|
fix request params pattern #393
|
2018-12-14 20:19:16 +08:00 |
|
nkorange
|
ffa9f92812
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:02:37 +08:00 |
|
Fury Zhu
|
5d08a7b61f
|
Merge pull request #465 from jameslcj/hotfix_393
fix #393
|
2018-12-14 20:01:47 +08:00 |
|
nkorange
|
1a72cbeff9
|
Update default property
|
2018-12-14 19:59:59 +08:00 |
|
Fury Zhu
|
01702384bc
|
Merge pull request #454 from jameslcj/hotfix_445
fix 445
|
2018-12-14 19:56:39 +08:00 |
|
zhichen
|
2bacedf58a
|
fix #393
|
2018-12-14 19:55:33 +08:00 |
|
zhichen
|
608935d08d
|
resolve conflict
|
2018-12-14 19:34:03 +08:00 |
|
nkorange
|
066aaeaec0
|
Merge branch 'master' into 0.7.0
# Conflicts:
# api/pom.xml
# client/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# console/src/main/resources/static/console-fe/src/i18ndoc.js
# console/src/main/resources/static/console-fe/src/locales/en-US.js
# console/src/main/resources/static/console-fe/src/locales/zh-CN.js
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# pom.xml
# test/pom.xml
|
2018-12-14 17:55:20 +08:00 |
|
nkorange
|
be64c1acf7
|
Update version to 0.7.0
|
2018-12-14 17:48:57 +08:00 |
|
nkorange
|
d2e4f4e6b4
|
Merge branch 'feature_cmdb' into 0.7.0
# Conflicts:
# api/pom.xml
# api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
# client/pom.xml
# client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/conf/application.properties
# distribution/conf/nacos-logback.xml
# distribution/pom.xml
# distribution/release-nacos.xml
# example/pom.xml
# naming/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# pom.xml
# test/pom.xml
|
2018-12-14 17:15:32 +08:00 |
|