Commit Graph

741 Commits

Author SHA1 Message Date
universefeeler
214ec62b90 delete some conflict sign 2019-01-04 23:03:12 +08:00
universefeeler
0a5f627808 fixed conflict 2019-01-04 22:34:58 +08:00
Keep
c5e18804ae
Merge pull request #542 from FrankBian/feature/read-api
Correct typos and Remove unnecessary method modifier in Interface
2019-01-04 15:11:36 +08:00
Fury Zhu
6c83ec925f
Merge pull request #567 from alibaba/feature_jvm_extend_jar_option
Fix #560
2019-01-04 14:23:54 +08:00
nkorange
dda1bafb86 Fix #560 2019-01-04 14:16:15 +08:00
cloud.huang
5881214631 #562 Limiter DEFAULT_LIMIT optimization 2019-01-03 18:43:53 +08:00
王彦民
54e69f01bc refactor: SuccessDialog i18n #474 2019-01-03 17:39:20 +08:00
Fury Zhu
957d9823be
Merge pull request #559 from alibaba/hotfix_server_side_check_lose_data
#558 Add access log setting
2019-01-03 17:16:48 +08:00
nkorange
5e244a7316 #558 Add access log setting 2019-01-03 16:49:57 +08:00
Fury Zhu
35e6daf948
Merge pull request #538 from canglang1973/master
translate javadoc to English.
2019-01-03 12:26:11 +08:00
FrankBian
b7e0f344fb correct typos,and remove some unnecessary 'public' method modifier 2018-12-29 17:40:15 +08:00
FrankBian
acc4e337d2 clean code,remove repeat code 2018-12-29 17:21:10 +08:00
Fury Zhu
deadaebcd5
Merge pull request #540 from alibaba/hotfix_server_side_check_lose_data
Hotfix server side check lose data
2018-12-29 16:04:13 +08:00
nkorange
3250533516 #526 Make more effort 2018-12-29 13:44:12 +08:00
xxc
77881396a2
Update README.md
update example Nacos version to 0.7.0
2018-12-29 11:19:11 +08:00
leitao1
fd31408ddd translate javadoc to English. 2018-12-29 09:39:48 +08:00
王彦民
07bfb68c06 refactor: ShowCodeing i18n #474 && fe build 2018-12-28 16:41:52 +08:00
王彦民
404e488a72 refactor: ImportDialog i18n #474 2018-12-28 16:41:52 +08:00
Keep
b32677aefb
Merge pull request #491 from wfnuser/fix/gitignore
[ISSUE #490] fix gitignore
2018-12-28 13:59:45 +08:00
wanglei1
34889e62a1 format codes and correct comments for nacos-api 2018-12-27 21:24:35 +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
yangyshdan
ab21d983af
Update CONTRIBUTING.md
#524
2018-12-25 21:13:43 +08:00
nkorange
16794d15e5 #523 add switch 2018-12-25 20:59:08 +08:00
王彦民
6a3370e2fd refactor: ExportDialog i18n #474 2018-12-25 18:16:36 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +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
nkorange
2c2aff7f91 Merge branch 'master' into feature_multi_tenant 2018-12-21 16:09:12 +08:00
wfnuser
83655d34b2 fix gitignore 2018-12-20 17:22:12 +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
nkorange
87a50a5e3e Merge remote-tracking branch 'origin/master' 2018-12-20 15:10:42 +08:00
nkorange
c56947c692 Fix windows startup error 2018-12-20 15:10:18 +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
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +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