Commit Graph

2638 Commits

Author SHA1 Message Date
chuntaojun
2e7549a0e2 refactor: Roll back the code 2020-04-01 16:51:03 +08:00
chuntaojun
b3fdacf035 refactor: 2020-04-01 16:37:29 +08:00
chuntaojun
d8714843a0 fix: hotfix issue 2560 2020-04-01 14:37:26 +08:00
Peter Zhu
fe923abd8c
Merge pull request #2557 from alibaba/develop
1.2.1 merge to master
2020-03-31 16:41:32 +08:00
nkorange
fd523b5e53 Build console 2020-03-31 14:38:43 +08:00
Peter Zhu
fea9e2d09e
Merge pull request #2550 from nkorange/hotfix_client_beat_lost_in_redirect
Hotfix client beat lost in redirect
2020-03-31 11:07:17 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
LoadChange
74e34ea58b console fe release 2020-03-30 11:33:02 +08:00
Peter Zhu
b7a2c756fe
Merge pull request #2403 from lkxiaolou/develop
fix checksum bug #2401
2020-03-29 23:01:48 +08:00
wolfdriver
8055985df4 去除无用代码 2020-03-29 22:54:33 +08:00
chuntaojun
586838e0a0 Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-29 13:26:19 +08:00
liaochuntao
da4a4140a3
Merge pull request #2546 from Maijh97/develop
[ISSUE #1674] fix task abort because of exception
2020-03-29 13:19:28 +08:00
maijh97
e9d7310b58 fix #1674 'delayTime' move method local variable 2020-03-29 12:21:43 +08:00
maijh97
60a518b944 fix #1674 field name change 2020-03-28 22:03:00 +08:00
maijh97
4226a49813 fix #1674 2020-03-28 20:43:09 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
chuntaojun
9133814bb9 fix: 2020-03-27 19:03:21 +08:00
chuntaojun
3dd42fed27 refactor: Generic fetch method modification 2020-03-27 18:48:00 +08:00
nkorange
a74d057d6d Fix #2537 2020-03-27 17:57:29 +08:00
nkorange
b29e6dc33b Fix #2537 2020-03-27 16:50:37 +08:00
Peter Zhu
f537ece5a4
Merge pull request #2504 from KeRan213539/fixImportAuthorityBug
修复开启权限后导入失败的BUG
2020-03-27 16:15:18 +08:00
nkorange
5b8d8fd763 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-27 15:48:40 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
Peter Zhu
a16b72eba4
Merge pull request #2534 from KeRan213539/fix#2533
Fix #2533
2020-03-27 15:44:18 +08:00
chuntaojun
57fc219f72 style: Fix License problem 2020-03-27 14:43:55 +08:00
chuntaojun
e0dd6cc652 fix: 2020-03-27 13:54:52 +08:00
chuntaojun
36b99c74ac test: fix BeatReactorTest 2020-03-27 13:15:31 +08:00
chuntaojun
418f88d4c6 docs: Configuration file information changes 2020-03-27 12:36:07 +08:00
qq213539
88e65ff1b9 fix #2533 2020-03-27 00:07:52 +08:00
chuntaojun
f5125dd396 test: Modified unit test 2020-03-26 21:21:54 +08:00
chuntaojun
5e51859483 style: remove useless folder 2020-03-26 21:00:51 +08:00
chuntaojun
da7ef15196 style: fix code style 2020-03-26 20:53:46 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
Peter Zhu
449ed0831a
Merge pull request #2528 from theonefx/develop
fix: https://github.com/alibaba/nacos/issues/2527
2020-03-26 15:24:18 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
theonefx
bebea333f5 spelling mistake 2020-03-26 10:55:44 +08:00
theonefx
fa1421b5f1 fix: https://github.com/alibaba/nacos/issues/2527 2020-03-26 00:07:15 +08:00
xxc
53be70a541
update readme.md 2020-03-24 19:40:54 +08:00
qq213539
e299eee7a2 修复配制页面切换namespace失效,一直拿public数据的问题 2020-03-23 13:52:19 +08:00
qq213539
22e22124bc 修复克隆后列表不刷新的问题 2020-03-22 12:11:34 +08:00
qq213539
eae965981f 解决开启认证后导入失败的BUG
导入失败时增加没权限的提示
解决克隆成功后列表不刷新的BUG
2020-03-21 20:37:54 +08:00
邪影oO
96fec3ab27
Merge pull request #16 from alibaba/develop
拉代码
2020-03-19 08:51:31 +08:00
Peter Zhu
91fe5c1ed0
Update README.md 2020-03-18 10:03:20 +08:00
dependabot[bot]
62036f7452 build(deps): bump acorn in /console/src/main/resources/static/console-fe
Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-17 11:01:54 +08:00
LoadChange
9ce1aef61b fix: closes #2453 2020-03-16 08:44:24 +08:00
LoadChange
be5a5892e9 fix: closes #2451 2020-03-15 22:54:51 +08:00
LoadChange
c22a593396 fix: closes #2443 2020-03-15 21:24:04 +08:00
LoadChange
9c01fd3814 fix: closes #2457 2020-03-15 19:59:12 +08:00
LoadChange
51ce42593b fix: closes #2449 2020-03-15 18:48:21 +08:00
lkxiaolou
83c098b8ca 统一md5计算 2020-03-14 17:54:06 +08:00