Commit Graph

404 Commits (1478ac18fa9c4eadb7f66328db99987b6d035e6b)

Author SHA1 Message Date
ibuler faa0275700 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler ab313aacd8 定义Command前
9 years ago
yumaojun a88ee0725d 1. 在授权规则添加页面 通过js 给予用户输入提醒
9 years ago
liuzheng712 f863f4b7ae 登陆web的密码(如不修改请留空)
9 years ago
liuzheng712 4bbae38150 confirm alert
9 years ago
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定
9 years ago
halcyon a04bb100bf Merge branch 'cmdb' into dev
9 years ago
halcyon f9b1d3059a fix bugs
9 years ago
yumaojun 757f7beeaf update merge conflict.
9 years ago
yumaojun 6582ee1624 1. 更新 和 添加 (role 和 rule )操作 以 msg 的方式 刷新页面
9 years ago
yumaojun 2ccd072416 1. delete role filed : is_screty_key
9 years ago
halcyon d42197db3a fix tower bugs
9 years ago
yumaojun 70e6904eb7 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
9 years ago
ibuler 42745c52df Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 8479989ea8 更换nav ico, 修复需要登陆,登陆后跳转到登陆前页面
9 years ago
liuzheng712 4027a87e7f user delete with alert confirm
9 years ago
liuzheng712 84992746de juser/change_info/ fix password can be ignore
9 years ago
yumaojun e5c1071073 Merge branch 'dev' into map_perm
9 years ago
yumaojun 11f6939b85 1. update role and update rule complete.
9 years ago
liuzheng712 036873e129 merge_dev
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
ibuler 2d27e3fee0 恢复修改前
9 years ago
ibuler 67771105ae key目录变化
9 years ago
liuzheng712 de9ce6dd19 select all
9 years ago
ibuler f0d901e136 修复分页bug
9 years ago
liuzheng712 1f5fa9a9bd merge
9 years ago
liuzheng712 96ac65b346 udpate
9 years ago
yumaojun c00e4c24a3 app jperm role and rule bug fixed...
9 years ago
yumaojun 844fe2c250 add asset ok ,pull
9 years ago
yumaojun 6da97c5403 merge dev ...
9 years ago
wangyong 1e41b79611 fix merge bug
9 years ago
ibuler 5d33493233 asset js
9 years ago
广宏伟 333ee713d4 解决分页bug,和random_pass
9 years ago
ibuler 3b07198b8a merge with cmdb
9 years ago
wangyong 0f29745bfa asset add batch
9 years ago
yumaojun 012950cb68 merge update...
9 years ago
yumaojun 83c2704d53 1. update role push
9 years ago
yumaojun 74b6b4dea2 1. rule push page completed
9 years ago
yumaojun f6bc03324f 1. rule operations list add delete edit info page compeleted
9 years ago
yumaojun 6d5d279f61 1. 增加授权规则的添加,删除,编辑,详情页面。
9 years ago
yumaojun 1eff4ab4ff add edit, detail page
9 years ago
yumaojun 1aed3b4d91 modify add rule html
9 years ago
yumaojun 9379bc1f6e merge failed, update....
9 years ago
yumaojun 6074bb033d ansible api add get_host_info in Class Tasks
9 years ago
halcyon b7c3cc5532 add idc
9 years ago
ibuler 4ae36d319c 修复用户信息显示bug
9 years ago
ibuler 0174da6c77 修改index页面
9 years ago
ibuler adc3703fba 添加绘图
9 years ago
ibuler f31bea2c70 使用echart
9 years ago
liuzheng712 6db7642331 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago