Commit Graph

79 Commits (49fbae4fad1b9a63daa685e098f61ee8ce59780c)

Author SHA1 Message Date
yumaojun b7d9e41b43 1. 修复角色推送 step3 失败 2015-11-28 22:54:59 +08:00
ibuler 2c0d42e0da fix some bug 2015-11-25 18:59:12 +08:00
wangyong 0262d94dd3 fix disk detail bug 2015-11-24 19:04:16 +08:00
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +08:00
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
ibuler ce02d430ba deal_command添加到静态方法中 2015-11-16 23:33:44 +08:00
ibuler 4abf2b06d8 添加jumpserver.conf 2015-11-16 23:11:37 +08:00
ibuler f0d901e136 修复分页bug 2015-11-16 18:34:51 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
广宏伟 b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
yumaojun 0862ffef98 merge map 2015-11-15 08:39:43 +08:00
yumaojun 012950cb68 merge update... 2015-11-14 23:07:08 +08:00
ibuler 20970db404 修复环境变量大小写,修改terminal类 2015-11-13 21:15:41 +08:00
yumaojun 9ec2b9ff1d merge filed, update files... 2015-11-13 12:50:21 +08:00
ibuler 91b5d039cc 修改邮件settings 2015-11-09 16:28:10 +08:00
ibuler 98c4d9bdba web terminal kill方法 2015-11-07 15:27:49 +08:00
ibuler 9a897e0cf4 修正导入select错误 2015-11-05 20:07:21 +08:00
root 7d412e4c18 update configure file 2015-10-28 22:30:34 +08:00
wangyong 8909386d0c models 2015-10-27 20:13:23 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 44c69ded78 干掉ldap前 2015-08-30 14:03:10 +08:00
root 1e170714c0 修改用户添加视图 2015-08-29 00:09:36 +08:00
ibuler fc22677f3f modify some 2015-06-09 23:06:32 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +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 311b65da00 ޸bug 2015-04-22 18:57:55 +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
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
ibuler 0d1d64e83c ޸ļ 2015-04-16 15:13:22 +08:00
ibuler e2e131146d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-16 14:33:55 +08:00
ibuler 60cb5561f0 ޸move 2015-04-16 14:32:51 +08:00
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
guanghongwei c08cee8052 û 2015-04-15 17:32:30 +08:00
guanghongwei 3424bef5d0 ޸bug 2015-04-15 12:07:59 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 4abf25ef13 hehe 2015-04-13 21:25:43 +08:00
guanghongwei 12df8cf060 ޸ 2015-04-11 17:45:33 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei 2b14fefb5c ޸ҳ 2015-04-08 18:08:39 +08:00
halcyon ef63fce7c4 修改bug,实时搜索完成 2015-04-07 19:15:45 +08:00
halcyon 7de943c6e4 管理员仪表盘基本完成 2015-04-05 22:52:37 +08:00
guanghongwei afcc784797 ޸û 2015-04-04 12:48:26 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
halcyon 1dddd98741 bug 2015-03-24 17:04:25 +08:00