Commit Graph

2183 Commits

Author SHA1 Message Date
zhixiang.yuan
aa141e0aac update taskDispatchPeriod default value 2020-02-21 15:24:42 +08:00
nkorange
13126a3af6 Add namespace page access control 2020-02-11 12:26:04 +08:00
liaochuntao
de836a6e2b
Merge pull request #2355 from ZShUn/dev-1.2.0
1.NacosProperties注解添加username password参数
2020-02-11 12:22:35 +08:00
Peter Zhu
938f024b51
Merge pull request #2347 from loadchange/develop_1.2.0
fix: menu config
2020-02-11 10:10:19 +08:00
ZShUn
16bbf5f37e 1.添加username password参数 2020-02-10 23:42:40 +08:00
LoadChange
94ddff5be5 fix: menu config 2020-02-07 09:09:15 +08:00
nkorange
da4192c4a5 Fix bug 2020-02-06 16:33:23 +08:00
Peter Zhu
983204c0c1
Merge pull request #2346 from loadchange/develop_1.2.0
fix: icon font url
2020-02-06 16:23:43 +08:00
LoadChange
43f3620474 fix: icon font url 2020-02-06 16:17:18 +08:00
LoadChange
abc6a44088 fix: configuration export 2020-02-06 13:41:42 +08:00
LoadChange
b6988b7516 fix: edit configuration 2020-02-06 13:41:42 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
ad8bec7391 #1105 fix startup script 2020-02-05 14:03:40 +08:00
nkorange
e0f9398e91 #1105 fix bug 2020-02-05 14:02:15 +08:00
Peter Zhu
fb3e176ccd
Merge pull request #2343 from loadchange/develop_1.2.0
fix: loading error
2020-02-05 13:37:20 +08:00
LoadChange
df9b939071 fix: loading error 2020-02-05 12:26:31 +08:00
Peter Zhu
8ba9313493
Merge pull request #2342 from loadchange/develop_1.2.0
fix: redirect error
2020-02-05 09:26:13 +08:00
LoadChange
7457b04e88 fix: redirect error 2020-02-04 23:12:44 +08:00
nkorange
374c575c79 #1105 fix bug 2020-02-04 17:21:33 +08:00
Peter Zhu
44cd2a8603
Merge pull request #2339 from loadchange/develop_1.2.0
fix: namespace value
2020-02-04 11:38:15 +08:00
LoadChange
550faf9c50 fix: namespace value 2020-02-04 10:43:13 +08:00
Peter Zhu
142ee292d5
Merge pull request #2338 from loadchange/develop_1.2.0
fix: namespace show name join id
2020-02-04 09:57:52 +08:00
LoadChange
25eb5580a6 fix: namespace show name join id 2020-02-04 09:46:28 +08:00
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
qq213539
9673afd068 修改重复代码 2020-01-17 17:08:51 +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
qq213539
58db0e266e fix #2275 2020-01-14 16:33:06 +08:00