github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,038 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

1038 Commits (88fbcabcbb35736b7426fc6a5e55f778b14d3822)

Author SHA1 Message Date
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 9ec2b9ff1d merge filed, update files... 2015-11-13 12:50:21 +08:00
yumaojun 4bfe326868 ansible api add get_host_info in Class Tasks 2015-11-13 00:34:32 +08:00
yumaojun 6074bb033d ansible api add get_host_info in Class Tasks 2015-11-13 00:31:27 +08:00
halcyon ec7b543bf2 Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb 2015-11-13 00:06:15 +08:00
halcyon b7c3cc5532 add idc 2015-11-13 00:03:51 +08:00
Zi Chuanxiu 1c3d642be2 fixed ansible command variables bug. 2015-11-10 19:55:12 +08:00
Zi Chuanxiu a2f84e943a update ansible api 2015-11-10 17:46:44 +08:00
ibuler 4ae36d319c 修复用户信息显示bug 2015-11-10 16:14:32 +08:00
ibuler 7fe0bb21b2 修改无日志记录提示 2015-11-10 16:00:05 +08:00
ibuler 0174da6c77 修改index页面 2015-11-10 15:50:35 +08:00
root 3d6d714495 asset alert history 2015-11-10 00:11:54 +08:00
ibuler adc3703fba 添加绘图 2015-11-10 00:02:56 +08:00
wangyong 6de253df58 delete xlsx 2015-11-09 21:04:47 +08:00
ibuler f31bea2c70 使用echart 2015-11-09 19:19:28 +08:00
liuzheng712 b61286891f update 2015-11-09 17:12:57 +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 91b5d039cc 修改邮件settings 2015-11-09 16:28:10 +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 7ea23e0fcc 修复无法终结web进程的bug 2015-11-08 12:01:08 +08:00
ibuler e60a3a697e 添加测试web terminal按钮 2015-11-07 17:41:16 +08:00
ibuler d899360c34 增加websocket认证 2015-11-07 17:32:32 +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 cab346686d update 2015-11-07 10:27:55 +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 6897d063c2 error = '用户未激活' 2015-11-07 09:09:36 +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
liuzheng712 f220ea367e upload file with user id path 2015-11-06 22:26:19 +08:00
ibuler 43c0770770 使用原生select 2015-11-06 12:09:23 +08:00
Zi Chuanxiu 82286ea7ed fix set host vars and add set group vars 2015-11-06 11:32:59 +08:00
ibuler 01d6f751b1 解决实时监控特殊字符，使用term.js 2015-11-06 10:42:10 +08:00
liuzheng712 7a25f348e4 upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID 2015-11-06 00:56:16 +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 0f8abb6026 update 2015-11-05 22:53:19 +08:00
Zi Chuanxiu 8e2f3fdecd update 2015-11-05 22:52:02 +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 618aed3278 移动api中关于tty到connect.py 2015-11-04 17:04:25 +08:00
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