Commit Graph

1042 Commits (255e3a043ad232c9f98fbc887d2712149d948121)

Author SHA1 Message Date
ibuler c8c0061244 添加权限鉴定 2015-11-04 16:24:52 +08:00
ibuler ad4b68a390 Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog 2015-11-04 15:21:44 +08:00
kelianchun_miller a95e313733 update api.py 2015-11-04 15:20:28 +08:00
ibuler 8b25d3e32e Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog 2015-11-04 15:15:03 +08:00
ibuler a0a7623743 修复log kill和在线查看命令统计 2015-11-04 15:11:14 +08:00
kelianchun_miller 5e20ac0454 update api.py 2015-11-04 14:56:50 +08:00
kelianchun_miller d182736bd7 update api.py 2015-11-04 14:50:47 +08:00
root 159398b391 fix bugs 2015-11-03 23:53:12 +08:00
ibuler e4ccb1c43f 修复日志打印的异常bug 2015-11-03 23:21:33 +08:00
ibuler 9d75ad6cea 多线程修复监控阻塞bug 2015-11-03 23:03:31 +08:00
ibuler b30697ea20 基本完成 2015-11-03 19:12:15 +08:00
wangyong 0c0f05b6d9 jasset base 2015-11-03 17:07:46 +08:00
ibuler 50d21fcdca for log monitor 2015-11-02 23:20:40 +08:00
Zi Chuanxiu c49a02d1c5 update ansible_api, and update perm_list_user view 2015-11-02 23:07:04 +08:00
Zi Chuanxiu c26594a3ec update ansible_api, and update perm_list_user view 2015-11-02 23:05:19 +08:00
Zi Chuanxiu 6572e6f10e update ansible_api, and update perm_list_user view 2015-11-02 23:03:41 +08:00
liuzheng712 5144907ec0 there is no need to set the password value, very change user info needs password, make sure this is legal 2015-11-02 16:00:34 +08:00
liuzheng712 ba8ed23292 add the @login_required(login_url='/login') 2015-11-02 15:51:18 +08:00
liuzheng712 6583b0f530 change the login response redirect 2015-11-02 15:50:46 +08:00
liuzheng712 a3bea76994 juser/urls.py format 2015-11-02 15:49:05 +08:00
ibuler@qq.com ebe8ce7109 some 2015-11-02 11:18:06 +08:00
Zi Chuanxiu df9d879f22 ansible api base complete... 2015-10-31 11:55:19 +08:00
halcyon 46b1aca5f1 model 2015-10-31 09:23:10 +08:00
Zi Chuanxiu dd4ac4e6d6 Task add method push_key 2015-10-30 23:14:45 +08:00
root fe23e61036 Task add method push_key 2015-10-30 23:08:45 +08:00
root b88c4211b2 update ansible_api.py 2015-10-30 08:25:22 +08:00
root 9e0d1a7285 add ansible_api module 2015-10-29 16:32:02 +08:00
广宏伟 73f94fecb5 fix import some bug 2015-10-29 12:01:03 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
广宏伟 d5bd2143e2 命令搜素完成 2015-10-28 22:32:16 +08:00
root 7d412e4c18 update configure file 2015-10-28 22:30:34 +08:00
liuzheng712 ac5ac5e06b change role finished , but need more think 2015-10-28 21:03:54 +08:00
ibuler@qq.com 53e4dc7acb search detail 2015-10-28 19:24:02 +08:00
liuzheng712 4d3e7d694b lots 2015-10-28 10:55:25 +08:00
liuzheng712 ca271900e6 remove request.session user_id and role_id, about role_id need more think, now is dirty 2015-10-27 23:57:37 +08:00
liuzheng712 f8c8c3deff update 2015-10-27 23:34:38 +08:00
ibuler@qq.com 76ad67307b search ok 2015-10-27 23:18:26 +08:00
ibuler@qq.com ffab7ae697 some 2015-10-27 20:25:18 +08:00
wangyong 8909386d0c models 2015-10-27 20:13:23 +08:00
liuzheng712 8e9f22537f reuse asset_list for host_list 2015-10-27 17:40:53 +08:00
广宏伟 9366003f7b jlog 2015-10-26 22:17:16 +08:00
ibuler@qq.com 72a18d6abf use map 2015-10-24 23:52:06 +08:00
ibuler@qq.com 79e81340dc modify log 2015-10-21 22:39:53 +08:00
ibuler@qq.com 4baffed481 base commit 2015-10-21 21:19:18 +08:00
广宏伟 77131a39d4 recovery playboo_run 2015-10-21 20:53:07 +08:00
广宏伟 40d00f7cbd lost playboo_run 2015-10-21 20:44:28 +08:00
ibuler@qq.com fe1f825fdf perm edit 2015-10-19 23:40:16 +08:00
ibuler@qq.com 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00