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

46 Commits (f3102e3b5b8b6e392edcf84e0ed22be575a55952)

Author SHA1 Message Date
wangyong 652ea98a2b alert ip -> hostname 2015-11-21 18:28:25 +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
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
ibuler f31bea2c70 使用echart 2015-11-09 19:19:28 +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 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
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +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
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
halcyon fef224459c 鉴权 2015-03-19 18:32:10 +08:00
guanghongwei 458ca42f22 未完成 2015-03-01 23:34:00 +08:00
guanghongwei 32ab6311ae 合并分支 2015-03-01 12:23:26 +08:00
halcyon b1e6699330 每日一更? 2015-02-12 18:54:40 +08:00
halcyon a42d053cbb 新弹窗等 2015-02-10 18:57:43 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
halcyon 433974d77d 改bug 2015-02-05 18:53:57 +08:00
guanghongwei 46cc593a9e Ȩ֧ 2015-02-03 23:03:51 +08:00
halcyon de58e92df9 添加组修改，组内删除主机并不删除真实机 2015-02-03 22:45:51 +08:00
guanghongwei 70fe42f359 ޸scriptλ 2015-02-01 23:33:38 +08:00
halcyon a8991bfb14 资产修改功能强化，日志功能添加 2015-01-31 12:55:10 +08:00
halcyon d1f6ed4a55 增加日志查看功能 2015-01-25 22:20:07 +08:00
halcyon 1925cf4033 增加js判断 2015-01-14 19:19:56 +08:00
halcyon 6b95c7ed6f 资产详情弹窗 2015-01-14 16:39:57 +08:00
guanghongwei 0c30e8fd53 ѡ 2015-01-10 12:30:21 +08:00
ibuler 4af80d2b61 查看iCheck 2015-01-09 22:51:46 +08:00
ibuler f497003948 修改content 2015-01-05 22:35:25 +08:00
ibuler 542873159b 添加Demo皮肤设置 2015-01-02 17:40:34 +08:00
ibuler d17c0bceb2 添加Demo皮肤设置 2015-01-02 17:23:59 +08:00
ibuler 8f95f11f35 添加Demo皮肤设置 2015-01-02 17:14:57 +08:00
ibuler cd9a62f40b 删除没用的css 2015-01-02 16:59:37 +08:00
ibuler 588545c3f9 添加静态资源css,js 2014-12-28 21:52:23 +08:00
ibuler b24ad2854c 添加static, templates 2014-12-22 23:20:47 +08:00