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

1170 Commits (3176608eaa2078a251515fedcbfecd1f257de7f9)

Author SHA1 Message Date
ibuler 98f0655da4 fix rule and role bug 2015-11-29 11:33:19 +08:00
yumaojun b241d6d148 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-11-28 23:00:40 +08:00
yumaojun b7d9e41b43 1. 修复角色推送 step3 失败 2015-11-28 22:54:59 +08:00
ibuler 3f000b9d54 修改role添加显示 2015-11-28 22:53:27 +08:00
ibuler 4672884255 修改role添加显示 2015-11-28 22:45:40 +08:00
ibuler a0ae7ff139 修改getresource 2015-11-28 22:08:47 +08:00
ibuler 8ac369b925 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-28 21:23:01 +08:00
ibuler 117f01e71f 中文播放bug fix 2015-11-28 21:13:44 +08:00
yumaojun 38416fbebb merge perm 2015-11-28 21:02:23 +08:00
yumaojun 39a0350e08 1. 完成Sudo 规则的 角色授权 
2. 角色详情里面 新增 推送详情
3. 角色推送 支持计算与叠加
 2015-11-28 19:33:21 +08:00
ibuler a099d2a25a 中文播放bug 2015-11-27 18:51:15 +08:00
ibuler bd885da179 recoard 特殊字符去掉 2015-11-27 17:53:11 +08:00
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
ibuler b64ab276fb 修改批量执行命令2 2015-11-27 13:24:57 +08:00
ibuler 66610fb3e7 修改批量执行命令 2015-11-27 12:20:08 +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 61deed70ad merge with connect 2015-11-26 21:47:37 +08:00
ibuler 601747ac49 fix 2015-11-26 21:01:39 +08:00
ibuler 2afce31e95 删掉添加导航 2015-11-26 20:19:54 +08:00
ibuler ba08602e20 添加登陆方式 2015-11-26 19:49:23 +08:00
ibuler 19dcf171e6 弹窗title修改 2015-11-26 19:06:17 +08:00
kelianchun_miller 1bbd685a23 update connect.py 2015-11-26 18:19:36 +08:00
ibuler 02c3bc75f3 connect.py 回滚 2015-11-26 17:42:03 +08:00
yumaojun 951467f8ca 1. 新增 PermPush表, 用于记录角色的推送记录 
2. 角色权限 以来 sudo 完成。
 2015-11-26 17:23:16 +08:00
ibuler cdfea145d9 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-26 17:18:47 +08:00
kelianchun_miller 431ad2940b update connect.py 2015-11-26 17:17:37 +08:00
ibuler 72b8ac2a50 Merge branch 'bug' into dev 2015-11-26 17:10:25 +08:00
ibuler d3153e9bb4 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-26 17:10:18 +08:00
ibuler 5045d66c1c fix 2015-11-26 17:10:09 +08:00
kelianchun_miller e71bbd4122 update connect.py 2015-11-26 14:26:58 +08:00
kelianchun_miller c4160e1d50 Accept Pull Request #2 : (kelianchun_miller:dev -> jumpserver:dev) 
Pull Request: 提交transport和命令解析
Created By: @kelianchun_miller
Accepted By: @kelianchun_miller
URL: https://coding.net/u/jumpserver/p/jumpserver/git/pull/2
 2015-11-26 14:25:07 +08:00
ibuler 46245ab4aa fix record bug 2015-11-26 13:21:05 +08:00
kelianchun_miller 8880b5ff4f update connect.py 
增加transport连接方式，同时增加了替换符号的命令处理
 2015-11-25 19:02:51 +08:00
ibuler 2c0d42e0da fix some bug 2015-11-25 18:59:12 +08:00
kelianchun_miller 1d70a23859 update connect.py 2015-11-25 18:52:18 +08:00
ibuler 0335bc26ca fix rule js bug 2015-11-25 16:37:17 +08:00
ibuler 60166ac008 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-25 16:06:30 +08:00
ibuler f760df1e34 角色key问题修复 2015-11-25 16:01:07 +08:00
ibuler 6fe6342ca4 角色key问题修复 2015-11-25 14:59:57 +08:00
liuzheng712 175f2702d1 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-25 14:52:30 +08:00
ibuler a7db713b1e Merge branch 'exec_cmd' into dev 2015-11-25 10:01:06 +08:00
yumaojun 1a0c9cd4e6 1. 新增 PermSudo表, 用于记录 sudo别名 
2. 实现Sudo表对应的 添加，显示，更新，删除页面
3. 添加角色时，需要选择对应的 sudo别名
 2015-11-24 22:03:58 +08:00
wangyong 742e56fc5f Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-11-24 19:04:28 +08:00
wangyong 0262d94dd3 fix disk detail bug 2015-11-24 19:04:16 +08:00
ibuler 32d036c2b0 修改setting字段 2015-11-24 17:38:27 +08:00
ibuler 1a63d32fe3 fix bug 2015-11-24 16:31:06 +08:00
ibuler ec9b00e255 fix bug 2015-11-24 13:37:36 +08:00
ibuler d7cb549eac Merge branch 'exec_cmd' into dev 2015-11-24 13:31:55 +08:00