Commit Graph

452 Commits (3f000b9d54df60ef094d98d0f8cd9fe0f2d96581)

Author SHA1 Message Date
liuzheng712 f863f4b7ae 登陆web的密码(如不修改请留空)
9 years ago
liuzheng712 4bbae38150 confirm alert
9 years ago
halcyon b4c13069c0 batch asset 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
ibuler 5692e9dc86 添加资产的默认设置
9 years ago
ibuler 7849ff2b92 解决搜索分页问题
9 years ago
halcyon e77ec102d9 just do it
9 years ago
ibuler e60a3a697e 添加测试web terminal按钮
9 years ago
ibuler 98c4d9bdba web terminal kill方法
9 years ago
ibuler 24730ebd0f web terminal记录日志
9 years ago
liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
liuzheng712 4ddddc134a 禁用 change to 启用
9 years ago
liuzheng712 44a330ac02 download page: waiting...
9 years ago
ibuler 01d6f751b1 解决实时监控特殊字符,使用term.js
9 years ago
liuzheng712 12a0a35adf upload page: need to fix click problem, want to show the list of machines, TODO
9 years ago
Zi Chuanxiu 26e3634814 mapping model
9 years ago
ibuler 9a897e0cf4 修正导入select错误
9 years ago
ibuler 1bc15e57a6 完成webtermial demo
9 years ago
liuzheng712 09087a4d8f set user password , if you don't want to change the password , leave password empty
9 years ago
liuzheng712 6934380b9c jperm/perm_apply.html
9 years ago
ibuler a0a7623743 修复log kill和在线查看命令统计
9 years ago
root 159398b391 fix bugs
9 years ago
ibuler 9d75ad6cea 多线程修复监控阻塞bug
9 years ago
ibuler b30697ea20 基本完成
9 years ago
wangyong 0c0f05b6d9 jasset base
9 years ago
ibuler 50d21fcdca for log monitor
9 years ago
liuzheng712 5144907ec0 there is no need to set the password value, very change user info needs password, make sure this is legal
9 years ago
ibuler@qq.com ebe8ce7109 some
9 years ago
halcyon 46b1aca5f1 model
9 years ago
ibuler@qq.com 0e24ebdb26 merge with dev
9 years ago
广宏伟 d5bd2143e2 命令搜素完成
9 years ago
liuzheng712 ac5ac5e06b change role finished , but need more think
9 years ago
ibuler@qq.com 53e4dc7acb search detail
9 years ago
liuzheng712 ca271900e6 remove request.session user_id and role_id, about role_id need more think, now is dirty
9 years ago
ibuler@qq.com 76ad67307b search ok
9 years ago
ibuler@qq.com ffab7ae697 some
9 years ago
liuzheng712 8e9f22537f reuse asset_list for host_list
9 years ago
广宏伟 9366003f7b jlog
9 years ago
ibuler@qq.com 72a18d6abf use map
9 years ago
ibuler@qq.com 79e81340dc modify log
9 years ago
ibuler@qq.com 50d2bfb272 someday
9 years ago
ibuler@qq.com 06eedff49f fix common
9 years ago
ibuler@qq.com afbbad1604 授权管理
9 years ago
ibuler@qq.com e99b33c51e 修改使用新表结构
9 years ago
Administrator 43fe985143 添加组授权
9 years ago
Administrator 699046dad5 修改settings
9 years ago
guanghongwei 9f7b066ca6 shouquanxiugai
9 years ago
liuzheng712 79c79432f5 usermodle
9 years ago
ibuler d32ea9f9a1 授权管理
9 years ago
ibuler 907c2c7e97 资产修改基本完成
9 years ago
ibuler 8bf9103fcf 修改资产管理
9 years ago
ibuler 4eb78e151e 用户模块修改告一段落
9 years ago
ibuler 3efd810fe1 修改修改用户bug
9 years ago
ibuler c21cdc2131 添加忘记密码
9 years ago
ibuler 44c69ded78 干掉ldap前
9 years ago
root 1e170714c0 修改用户添加视图
9 years ago