nkorange
|
82d7147a58
|
Update version to 1.2.0
|
2020-03-03 16:24:08 +08:00 |
|
nkorange
|
043a091445
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2020-03-02 16:47:28 +08:00 |
|
nkorange
|
025b1b4980
|
Fix test case error
|
2020-03-02 16:47:13 +08:00 |
|
liaochuntao
|
7b68943e36
|
Update README.md
|
2020-03-02 15:02:03 +08:00 |
|
liaochuntao
|
1579f5544a
|
Update README.md
|
2020-03-01 20:21:34 +08:00 |
|
liaochuntao
|
853bc1c8f2
|
Update README.md
|
2020-03-01 20:20:33 +08:00 |
|
liaochuntao
|
806ca5c473
|
Update README.md
|
2020-03-01 20:20:00 +08:00 |
|
liaochuntao
|
5319897ca2
|
Merge pull request #2390 from jzdayz/develop
delete duplicate code and fix log error
|
2020-03-01 16:06:26 +08:00 |
|
nkorange
|
cc0a4915c7
|
Merge branch 'develop_1.2.0' into develop
# Conflicts:
# console/src/main/resources/static/css/main.css
# console/src/main/resources/static/js/main.js
|
2020-02-27 16:18:54 +08:00 |
|
jzdayz
|
deab304d5b
|
fix log error
|
2020-02-27 14:41:25 +08:00 |
|
jzdayz
|
1b9e1db351
|
去掉重复代码
|
2020-02-27 14:33:47 +08:00 |
|
nkorange
|
0f513c1f20
|
Merge remote-tracking branch 'upstream/develop_1.2.0' into develop_1.2.0
|
2020-02-23 20:03:10 +08:00 |
|
nkorange
|
31e6063209
|
Update version to 1.2.0-beta.1
|
2020-02-23 20:02:13 +08:00 |
|
liaochuntao
|
701cbbf1d2
|
Merge pull request #2381 from zhixiangyuan/develop_1.2.0
统一 taskDispatchPeriod 的默认值
|
2020-02-23 12:01:29 +08:00 |
|
zhixiang.yuan
|
c2743f90eb
|
#2381 modify taskDispatchPeriod defalue value
|
2020-02-22 19:37:26 +08:00 |
|
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 |
|
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 |
|