Commit Graph

123 Commits (2afce31e9583b638cd651e9ed499f9f7b294b28a)

Author SHA1 Message Date
wangyong 99439be04f add update all button
9 years ago
halcyon 34031bfd6b fix bugs
9 years ago
wangyong 5a3c11f619 asset update batch and crontab
9 years ago
wangyong b8cb6f4246 Merge branch 'dev' into cmdb
9 years ago
wangyong d25e23623a fix bugs
9 years ago
wangyong 0ebb7c4f9a merge cmdb
9 years ago
wangyong 652ea98a2b alert ip -> hostname
9 years ago
halcyon b4c13069c0 batch asset alert
9 years ago
halcyon a04bb100bf Merge branch 'cmdb' into dev
9 years ago
halcyon f9b1d3059a fix bugs
9 years ago
halcyon d42197db3a fix tower bugs
9 years ago
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option.
9 years ago
yumaojun c00e4c24a3 app jperm role and rule bug fixed...
9 years ago
yumaojun 6da97c5403 merge dev ...
9 years ago
yumaojun 218ba0d189 merge ...
9 years ago
ibuler 3b07198b8a merge with cmdb
9 years ago
yumaojun 8b94833ea0 1. role push function use password and public key completed
9 years ago
wangyong 0f29745bfa asset add batch
9 years ago
yumaojun 012950cb68 merge update...
9 years ago
yumaojun 9ec2b9ff1d merge filed, update files...
9 years ago
halcyon ec7b543bf2 Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
9 years ago
halcyon b7c3cc5532 add idc
9 years ago
root 3d6d714495 asset alert history
9 years ago
halcyon e77ec102d9 just do it
9 years ago
Zi Chuanxiu 8e2f3fdecd update
9 years ago
Zi Chuanxiu 26e3634814 mapping model
9 years ago
root 159398b391 fix bugs
9 years ago
wangyong 0c0f05b6d9 jasset base
9 years ago
halcyon 46b1aca5f1 model
9 years ago
ibuler@qq.com 0e24ebdb26 merge with dev
9 years ago
wangyong 8909386d0c models
9 years ago
ibuler@qq.com fe1f825fdf perm edit
9 years ago
ibuler@qq.com afbbad1604 授权管理
9 years ago
ibuler@qq.com e99b33c51e 修改使用新表结构
9 years ago
Administrator 699046dad5 修改settings
9 years ago
liuzheng712 02218e624a lots
9 years ago
liuzheng712 5a5928483f lots
9 years ago
ibuler d32ea9f9a1 授权管理
9 years ago
ibuler 907c2c7e97 资产修改基本完成
9 years ago
ibuler 960e45d0fa 添加asset_api
9 years ago
ibuler 8bf9103fcf 修改资产管理
9 years ago
ibuler 4eb78e151e 用户模块修改告一段落
9 years ago
ibuler 33c624c76f 删除部门后
9 years ago
ibuler c1facb939e 优化connect.py排序
9 years ago
Guang 9f0620f97e 调整User,UserGroup类
9 years ago
ibuler fc22677f3f modify some
10 years ago
halcyon 04522c0b80 修改port字段
10 years ago
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug
10 years ago
halcyon 27d6df7a38 解决django低版本不支持first()问题
10 years ago
halcyon 86e334e4fa last bug?
10 years ago