Commit Graph

2158 Commits

Author SHA1 Message Date
nkorange
23a44df512 #1105 fix bug 2020-02-04 09:27:02 +08:00
Peter Zhu
fe45fa687f
Merge pull request #2337 from loadchange/develop_1.2.0
fix: repair resource
2020-02-04 08:45:29 +08:00
LoadChange
71ed0571a0 fix: repair resource 2020-02-03 22:35:37 +08:00
Peter Zhu
880ba721b0
Merge pull request #2324 from loadchange/develop_1.2.0
Develop 1.2.0
2020-01-28 11:22:47 +08:00
LoadChange
03e910ea59 fix: permissions management 2020-01-19 15:33:29 +08:00
LoadChange
a0610235b2 Merge branch 'develop_1.2.0' of github.com:alibaba/nacos into develop_1.2.0 2020-01-19 15:02:46 +08:00
Peter Zhu
fd5f0fe159
Merge pull request #2313 from paderlol/develop
Fixed heath check error with Nacos by standalone #2295
2020-01-17 16:47:07 +08:00
Peter Zhu
2ac4635881
Merge pull request #2316 from KeRan213539/ConfigExportAndImportAPI_ITCase
修改配制导入导出的测试用例
2020-01-17 15:50:35 +08:00
qq213539
bad5c53d9c no message 2020-01-17 15:32:38 +08:00
qq213539
9ff1c38762 修改测试用例 2020-01-17 15:09:50 +08:00
LoadChange
190c590b6e Merge branch 'develop_1.2.0' of github.com:alibaba/nacos into develop_1.2.0 2020-01-17 14:38:51 +08:00
zhanglong
26f2cba100 Fixed heath check error with Nacos by standalone 2020-01-17 02:01:05 +08:00
zhanglong
c14ee9ca04 Removed useless commits 2020-01-17 01:58:13 +08:00
zhanglong
74b9d3a197 Fixed heath check error with Nacos by standalone #2295 2020-01-17 01:45:57 +08:00
zhanglong
0074aa294a Deleted dns module 2020-01-17 00:52:47 +08:00
zhanglong
6b2fb8e032 Merge remote-tracking branch 'remote/develop' into develop
# Conflicts:
#	console/src/main/resources/application.properties
#	pom.xml
2020-01-16 22:56:27 +08:00
nkorange
7bbd867c2c #1105 Fix test case error 2020-01-16 22:39:09 +08:00
LoadChange
093f94e51f Merge branch 'develop_1.2.0' of github.com:alibaba/nacos into develop_1.2.0 2020-01-16 20:11:29 +08:00
Peter Zhu
92fd445a6b
Merge pull request #2235 from nkorange/hotfix_distro_load_data_failed_cause_start_failed
Fix #2232
2020-01-16 14:24:48 +08:00
Peter Zhu
1d148202ef
Merge branch 'master' into hotfix_distro_load_data_failed_cause_start_failed 2020-01-16 13:59:49 +08:00
nkorange
bc5e3e1cce #1105 Finish auth IT cases 2020-01-15 17:57:01 +08:00
LoadChange
e298b423aa fix: eslint error 2020-01-14 21:15:50 +08:00
LoadChange
0b330c53cb fix: api error 2020-01-14 21:12:53 +08:00
LoadChange
0b41b3d394 feat: password confirmation 2020-01-14 20:18:50 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
Peter Zhu
134b45401c
Merge pull request #2301 from KeRan213539/build_20200114
前端编译:2020-01-14 12:50
2020-01-14 13:59:02 +08:00
qq213539
a57ea7ce60 前端编译 2020-01-14 12:51:01 +08:00
邪影oO
89760cd7bf
Merge pull request #12 from alibaba/develop
拉代码
2020-01-14 12:39:21 +08:00
Peter Zhu
29119d0956
Merge pull request #2294 from loadchange/feature/191226
Feature/191226
2020-01-13 11:53:32 +08:00
LoadChange
f29079a411 Merge remote-tracking branch 'upstream/develop' into feature/191226 2020-01-13 11:40:06 +08:00
Peter Zhu
50e511d904
Merge pull request #2288 from alibaba/develop
Merge develop into develop_1.2.0
2020-01-12 21:37:37 +08:00
nkorange
2da88de159 Fix findbugs 2020-01-12 16:57:03 +08:00
nkorange
7a17ad28e2 Fix CI error 2020-01-12 16:43:23 +08:00
nkorange
2dafa405d3 Merge remote-tracking branch 'upstream/develop' into develop 2020-01-11 22:15:01 +08:00
nkorange
bca216fd99 Update travis config 2020-01-11 22:11:08 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control
Feature access control
2020-01-10 17:54:29 +08:00
Peter Zhu
8df4c0ed54
Merge pull request #2286 from lidaoyang/hotfix_2285
Hotfix 2285
2020-01-10 17:48:52 +08:00
lidaoyang
848b1b1349 Fix #2285 2020-01-10 17:38:21 +08:00
LoadChange
9f7e4f5a60 merge develop 2020-01-10 17:32:05 +08:00
LoadChange
c9b48081f1 feat: fe build 2020-01-10 17:26:03 +08:00
lidaoyang
ac502b305b Fix #2285 2020-01-10 17:11:55 +08:00
lidaoyang
3aa42b6014 Revert "Fix #2285"
This reverts commit 1d9495d5
2020-01-10 17:10:34 +08:00
LoadChange
38e5dd9447 fix: authority menu 2020-01-10 16:47:15 +08:00
Peter Zhu
47f1085563
Merge pull request #2283 from rushsky518/log_config
#2245 correct log config
2020-01-10 16:04:29 +08:00
Peter Zhu
a96cb67f44
Merge pull request #2276 from langghaha/develop
replace null return value
2020-01-10 16:02:38 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop
receive config change event
2020-01-10 15:41:24 +08:00
wb-ldy613915
1d9495d50b Fix #2285 2020-01-10 15:33:59 +08:00
Peter Zhu
0de98517f8
Merge pull request #2261 from nkorange/hotfix_healthcheck_not_isolated_by_namespace
Fix #2258
2020-01-10 15:27:13 +08:00
Peter Zhu
f4c01068c9
Merge pull request #2282 from jzdayz/no_necessary
简化一点代码
2020-01-10 15:25:23 +08:00