github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,031 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

466 Commits (dd912e8958eabbfb40a9b0a8ddeb8a51b6fd844e)

Author SHA1 Message Date
liuzheng712 962d16172c Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-22 20:35:03 +08:00
ibuler 4cdc7f33ce 添加注释 2015-11-22 20:20:32 +08:00
wangyong b8cb6f4246 Merge branch 'dev' into cmdb 2015-11-22 18:58:31 +08:00
wangyong d25e23623a fix bugs 2015-11-22 18:57:47 +08:00
ibuler a143797ac9 修改gen_resource api 2015-11-22 17:56:38 +08:00
liuzheng712 09de12c02a index show assets, need discussion 2015-11-22 13:04:11 +08:00
liuzheng712 ea059790a9 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-21 21:24:17 +08:00
liuzheng712 6ae4907520 update 2015-11-21 21:24:01 +08:00
wangyong 0ebb7c4f9a merge cmdb 2015-11-21 18:37:40 +08:00
wangyong 652ea98a2b alert ip -> hostname 2015-11-21 18:28:25 +08:00
ibuler faa0275700 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-20 21:48:58 +08:00
ibuler ab313aacd8 定义Command前 2015-11-20 18:42:44 +08:00
yumaojun a88ee0725d 1. 在授权规则添加页面　通过js 给予用户输入提醒 2015-11-20 14:07:17 +08:00
yumaojun e57c6a9d2e 1. 在授权规则添加页面　通过js 给予用户输入提醒 2015-11-20 14:03:05 +08:00
liuzheng712 f863f4b7ae 登陆web的密码（如不修改请留空） 2015-11-20 11:26:07 +08:00
liuzheng712 4bbae38150 confirm alert 2015-11-20 11:16:47 +08:00
halcyon b4c13069c0 batch asset alert 2015-11-20 00:03:36 +08:00
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +08:00
halcyon a04bb100bf Merge branch 'cmdb' into dev 2015-11-19 22:01:38 +08:00
halcyon f9b1d3059a fix bugs 2015-11-19 21:58:44 +08:00
yumaojun 757f7beeaf update merge conflict. 2015-11-19 13:20:27 +08:00
yumaojun 6582ee1624 1. 更新 和 添加 （role 和 rule )操作 以 msg 的方式 刷新页面 2015-11-18 22:32:21 +08:00
yumaojun 2ccd072416 1. delete role filed : is_screty_key 
2. rule edit page  add selected mark
3. role add page  consider user use_default_auth attribute
4. role password use jumpserver api CRYPTO to crypt
5. fixed ansible api auto load local host file (/etc/ansible/hosts) bug
6. ansible api command and task  interface add pattern  default argument( pattern='*')
 2015-11-18 17:16:29 +08:00
halcyon d42197db3a fix tower bugs 2015-11-17 23:34:13 +08:00
yumaojun 70e6904eb7 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-11-17 22:17:18 +08:00
ibuler 42745c52df Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-17 21:41:31 +08:00
ibuler 8479989ea8 更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面 2015-11-17 21:41:03 +08:00
liuzheng712 4027a87e7f user delete with alert confirm 2015-11-17 20:25:15 +08:00
liuzheng712 84992746de juser/change_info/ fix password can be ignore 2015-11-17 20:06:25 +08:00
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
yumaojun 11f6939b85 1. update role and update rule complete. 2015-11-17 13:48:19 +08:00
liuzheng712 036873e129 merge_dev 2015-11-17 09:53:43 +08:00
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option. 2015-11-16 23:44:53 +08:00
ibuler 2d27e3fee0 恢复修改前 2015-11-16 22:46:36 +08:00
ibuler 67771105ae key目录变化 2015-11-16 22:45:41 +08:00
liuzheng712 de9ce6dd19 select all 2015-11-16 22:28:02 +08:00
ibuler f0d901e136 修复分页bug 2015-11-16 18:34:51 +08:00
liuzheng712 1f5fa9a9bd merge 2015-11-16 14:21:21 +08:00
liuzheng712 96ac65b346 udpate 2015-11-16 14:09:02 +08:00
yumaojun c00e4c24a3 app jperm role and rule bug fixed... 2015-11-16 13:49:39 +08:00
yumaojun 844fe2c250 add asset ok ,pull 2015-11-15 23:43:19 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
wangyong 1e41b79611 fix merge bug 2015-11-15 23:29:31 +08:00
ibuler 5d33493233 asset js 2015-11-15 23:21:59 +08:00
广宏伟 333ee713d4 解决分页bug，和random_pass 2015-11-15 18:20:34 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
wangyong 0f29745bfa asset add batch 2015-11-14 23:09:13 +08:00
yumaojun 012950cb68 merge update... 2015-11-14 23:07:08 +08:00
yumaojun 83c2704d53 1. update role push 2015-11-14 22:54:29 +08:00
yumaojun 74b6b4dea2 1. rule push page completed 2015-11-14 21:52:09 +08:00
yumaojun f6bc03324f 1. rule operations list add delete edit info page compeleted 
2. rule operations list add delete edit info page compeleted
 2015-11-14 21:13:02 +08:00
yumaojun 6d5d279f61 1. 增加授权规则的添加，删除，编辑，详情页面。 
2. 修改nav.html中关于授权部分页面。
3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。
 2015-11-14 10:16:48 +08:00
yumaojun 1eff4ab4ff add edit, detail page 2015-11-13 17:17:22 +08:00
yumaojun 1aed3b4d91 modify add rule html 2015-11-13 13:21:57 +08:00
yumaojun 9379bc1f6e merge failed, update.... 2015-11-13 13:06:17 +08:00
yumaojun 6074bb033d ansible api add get_host_info in Class Tasks 2015-11-13 00:31:27 +08:00
halcyon b7c3cc5532 add idc 2015-11-13 00:03:51 +08:00
ibuler 4ae36d319c 修复用户信息显示bug 2015-11-10 16:14:32 +08:00
ibuler 0174da6c77 修改index页面 2015-11-10 15:50:35 +08:00
ibuler adc3703fba 添加绘图 2015-11-10 00:02:56 +08:00
ibuler f31bea2c70 使用echart 2015-11-09 19:19:28 +08:00
liuzheng712 6db7642331 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-09 16:58:55 +08:00
ibuler 5692e9dc86 添加资产的默认设置 2015-11-09 11:56:31 +08:00
ibuler 7849ff2b92 解决搜索分页问题 2015-11-09 10:53:15 +08:00
halcyon e77ec102d9 just do it 2015-11-08 22:39:30 +08:00
ibuler e60a3a697e 添加测试web terminal按钮 2015-11-07 17:41:16 +08:00
ibuler 98c4d9bdba web terminal kill方法 2015-11-07 15:27:49 +08:00
ibuler 24730ebd0f web terminal记录日志 2015-11-07 13:38:50 +08:00
liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 
# Conflicts:
#	jumpserver/views.py
#	juser/models.py
#	juser/views.py
#	templates/jperm/perm_apply.html
 2015-11-07 09:37:10 +08:00
liuzheng712 4ddddc134a 禁用 change to 启用 2015-11-06 23:13:02 +08:00
liuzheng712 44a330ac02 download page: waiting... 2015-11-06 23:04:09 +08:00
ibuler 01d6f751b1 解决实时监控特殊字符，使用term.js 2015-11-06 10:42:10 +08:00
liuzheng712 12a0a35adf upload page: need to fix click problem, want to show the list of machines, TODO 2015-11-06 00:21:59 +08:00
Zi Chuanxiu 26e3634814 mapping model 2015-11-05 22:47:45 +08:00
ibuler 9a897e0cf4 修正导入select错误 2015-11-05 20:07:21 +08:00
ibuler 1bc15e57a6 完成webtermial demo 2015-11-05 18:31:00 +08:00
liuzheng712 09087a4d8f set user password , if you don't want to change the password , leave password empty 2015-11-05 14:30:59 +08:00
liuzheng712 6934380b9c jperm/perm_apply.html 2015-11-05 13:16:23 +08:00
ibuler a0a7623743 修复log kill和在线查看命令统计 2015-11-04 15:11:14 +08:00
root 159398b391 fix bugs 2015-11-03 23:53:12 +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
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
ibuler@qq.com ebe8ce7109 some 2015-11-02 11:18:06 +08:00
halcyon 46b1aca5f1 model 2015-10-31 09:23:10 +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
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 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
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
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 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +08:00