Commit Graph

425 Commits (a7db713b1e2ef1cb0eb42ce17e0dddf26c75c0d0)

Author SHA1 Message Date
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
ibuler 10d96a9767 修改用户组视图
9 years ago
ibuler 33c624c76f 删除部门后
9 years ago
ibuler 913f93b91f 删除部门前
9 years ago
ibuler 1662269153 websocket auth add
10 years ago
ibuler ce99bf2266 placeholder
10 years ago
ibuler 1952d1ca23 modify sudo show
10 years ago
ibuler 6d34bd45d2 modify nav_bar_header.html
10 years ago
ibuler 992947ac99 modify service.sh bug
10 years ago
ibuler ba55cdde87 modify service.sh bug
10 years ago
ibuler 0beb683c40 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
10 years ago
root b134c90bfd 解决阻断报错问题
10 years ago
ibuler 311b65da00 ޸bug
10 years ago
ibuler e2ac212fc3 resolve confilict
10 years ago
ibuler 09d3763a02 fix a bug
10 years ago
ibuler 0a8198b2ca ޸Ƴbug
10 years ago
ibuler d84ff97019 ޸Ƴbug
10 years ago
ibuler 412dadce76 version 2.0.0 beta
10 years ago
ibuler 8b50e5252f merge with wangyong
10 years ago
halcyon 86e334e4fa last bug?
10 years ago
ibuler d5fba23d73 ȨҳûҳӵȨб
10 years ago
ibuler e96053ba20 ޸
10 years ago
ibuler 6d6e9d97b5 ޸
10 years ago
ibuler 9ab855fd92 merge
10 years ago
ibuler c1d8de4558 ϲ
10 years ago
halcyon f19b274fcc bug
10 years ago
ibuler 0873211d13 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
10 years ago
ibuler bcc5774365 ӳɹҳ
10 years ago