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

84 Commits (7106e915efb4369ec074d9f2f81c80e0eac2f88c)

Author SHA1 Message Date
ibuler 35db337f79 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-27 16:16:47 +08:00
ibuler c3f1e0e06e 批量执行命令记录日志 bug fix 2015-11-27 16:16:38 +08:00
halcyon 09dcdfa318 fix some bugs and hehe 2015-11-26 23:42:58 +08:00
ibuler c574bbcb96 fix date change bug 2015-11-26 23:26:11 +08:00
ibuler 6fe6342ca4 角色key问题修复 2015-11-25 14:59:57 +08:00
wangyong dd4c243d7c Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb 2015-11-24 09:53:50 +08:00
halcyon 34031bfd6b fix bugs 2015-11-23 23:55:19 +08:00
wangyong a9196ef149 merge cmdb | add asset update batch and crontab 2015-11-23 11:12:14 +08:00
wangyong d25e23623a fix bugs 2015-11-22 18:57:47 +08:00
wangyong 652ea98a2b alert ip -> hostname 2015-11-21 18:28:25 +08:00
halcyon b4c13069c0 batch asset alert 2015-11-20 00:03:36 +08:00
halcyon f9b1d3059a fix bugs 2015-11-19 21:58:44 +08:00
halcyon d42197db3a fix tower bugs 2015-11-17 23:34:13 +08:00
liuzheng712 036873e129 merge_dev 2015-11-17 09:53:43 +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
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +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
halcyon e77ec102d9 just do it 2015-11-08 22:39:30 +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 12a0a35adf upload page: need to fix click problem, want to show the list of machines, TODO 2015-11-06 00:21:59 +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
root 159398b391 fix bugs 2015-11-03 23:53:12 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
ibuler@qq.com 53e4dc7acb search detail 2015-10-28 19:24:02 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
liuzheng712 11b3cee346 gitignore 2015-10-03 22:50:05 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 58fd4374c7 Merge branch 'wangyong' 2015-05-15 12:01:51 +08:00
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug 2015-05-14 18:02:20 +08:00
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
halcyon 75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
ibuler 60cb5561f0 ޸move 2015-04-16 14:32:51 +08:00
guanghongwei 30fd160079 upload and resove 2015-04-09 13:55:16 +08:00
guanghongwei 2e5b22417d л 2015-03-30 21:31:02 +08:00
halcyon fef224459c 鉴权 2015-03-19 18:32:10 +08:00
guanghongwei d90b59191f ع1 2015-03-02 18:27:48 +08:00
guanghongwei 458ca42f22 未完成 2015-03-01 23:34:00 +08:00
guanghongwei a50d3ba692 头像大小导致 nav颜色中间差 2015-03-01 22:46:19 +08:00
guanghongwei 32ab6311ae 合并分支 2015-03-01 12:23:26 +08:00