github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,361 Commits
72 Branches
250 Tags
118 MiB
Commit Graph

2361 Commits (56e648e924472e7f719525905f41850e6d68fe47)

Author SHA1 Message Date
wangyong a1e947ae1e fix asset upload bug 2016-03-22 17:32:43 +08:00
ibuler 300e106143 Merge pull request #140 from Astraeux/smtp_ssl_fix 
SMTP发邮件支持SSL
 2016-03-22 16:32:51 +08:00
ibuler 57e85affde Merge pull request #141 from jumpserver/termShake 
fix: when moniter the terminal, fix the shake
 2016-03-22 10:22:42 +08:00
liuzheng712 34b74b9e4e fix: when moniter the terminal, fix the shake 2016-03-21 22:51:28 +08:00
Astraeux c218949556 SMTP发邮件支持SSL 2016-03-21 21:55:03 +08:00
Astraeux 4b90cd9b82 Merge pull request #3 from jumpserver/dev 
update from origin
 2016-03-21 20:08:34 +08:00
ibuler fcb3fd7186 Merge pull request #139 from jumpserver/issue_52_bugfix 
Issue 52 bugfix: 修复录像播放，web terminal hang住bug
 2016-03-21 11:11:21 +08:00
ibuler 4dbc6803fb Update README.md 2016-03-21 11:00:31 +08:00
ibuler b6af8368b6 Merge pull request #138 from jumpserver/role_pass_long_bug 
修复系统用户role密码过长引起的异常
 2016-03-21 10:40:59 +08:00
ibuler 6e4b291808 fix(perm_role_edit) 修复编辑系统用户密码过长bug 
1. 添加前端验证

close #173
 2016-03-21 10:32:08 +08:00
ibuler 4c88ea3c05 fix(perm_role_add) 修复添加系统用户密码过长导致的异常bug 
1. 修改表结构password长度
2. 修改template添加js验证
 2016-03-21 10:30:29 +08:00
ibuler 0e5fd68e6c Merge pull request #129 from jumpserver/bug_fix_100_and_127 
fix (jperm):   统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码
 2016-03-19 13:18:06 +08:00
liuzheng712 1103ee8f52 len(vim_data) 2016-03-18 23:55:06 +08:00
liuzheng712 9efa9e979c len(vim_data) 2016-03-18 23:51:25 +08:00
liuzheng712 f331b4471f Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix 2016-03-18 23:41:19 +08:00
kelianchun f11016f57c Merge pull request #136 from kelianchun/dev 
pull issue #120
 2016-03-18 23:38:26 +08:00
Astraeux 4b53bae57b Merge pull request #1 from jumpserver/dev 
update from origin
 2016-03-18 23:37:22 +08:00
kelianchun_miller b2ccbc3f9e pull issue #120 2016-03-18 23:36:31 +08:00
kelianchun_miller 7dcf050dc4 pull issue #120 2016-03-18 22:06:40 +08:00
kelianchun_miller 717869fd30 Merge remote-tracking branch 'remotes/origin/master' into dev 2016-03-18 22:04:12 +08:00
kelianchun_miller 598d6cffa4 pull issue #120 2016-03-18 20:43:25 +08:00
liuzheng712 c022c81100 Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix 2016-03-18 17:32:46 +08:00
liuzheng712 5af9dd655e delete_require_chardet 2016-03-18 17:08:15 +08:00
ibuler abdf9c72ca Merge pull request #122 from jumpserver/bug_fix_80 
fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息
 2016-03-18 17:00:09 +08:00
ibuler 3778724b73 Merge pull request #134 from kelianchun/dev 
修复命令截取bug
 2016-03-18 16:46:02 +08:00
kelianchun d76865c1ed pull issue #120 
修复了命令处理的bug
 2016-03-18 15:38:31 +08:00
liuzheng712 3ccf7adac1 终于修复了乱码啦啦啦 2016-03-18 15:01:07 +08:00
yumaojun c0e8ff8620 fix (jperm): 统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码 
1. perm_role_add 同上 保留 密码选项
2. perm_role_edit 同上 保留 密码选项
3. 仅保持入数据，不设计远程操作

close #100
close #127
 2016-03-16 23:03:43 +08:00
yumaojun ca75484eb8 fix (jperm): 统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码 
1. perm_role_push 模板取消密码选项，但是为了 那么留下秘钥推送可勾选，允许空推送
2. perm_role_add 同上 取消 密码选项
3. perm_role_edit 同上 取消 密码选项
4. views 调整role push add edit 相关视图
5. perm_api，调整 gen_resource，仅支持秘钥认证（是否需要支持密码认证，我觉得没必要，如果需要请提出)

close #100
close #127
 2016-03-16 22:30:39 +08:00
liuzheng712 8adf1c5d71 requirement 2016-03-15 15:11:33 +08:00
liuzheng712 5f35b740df test 2016-03-15 15:06:37 +08:00
liuzheng712 b0d1dd9485 test 2016-03-15 15:04:15 +08:00
liuzheng712 ade8fb927c test 2016-03-15 15:02:16 +08:00
liuzheng712 31708c0d24 udpate 2016-03-15 14:53:30 +08:00
liuzheng712 9b3a51469e install_chardet 2016-03-15 14:46:25 +08:00
yumaojun cdd31227b7 fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息 
1. 超时原因应该是sshd　的配置引起的，当前bsd的更新　相对于其他发行版　慢，这个原因估计的bsd自身有关
 2. ansible 的setup模块对于b sd获取的字段　越有偏差，而且无法获取硬盘信息，这个后期可以　提交patch 给ansible的setup模块。

 close #80
 2016-03-14 22:47:33 +08:00
jiaxiangkong b02a45ee6c Update README.md 2016-03-10 17:43:37 +08:00
jiaxiangkong f796e8f673 Update README.md 2016-03-10 17:42:45 +08:00
jiaxiangkong 930c57398a Update README.md 2016-03-10 17:40:54 +08:00
ibuler 6b39c9946b Merge pull request #116 from jumpserver/bug_fix_guang 
fix(bug) 修复首页点击头像404问题
 2016-03-06 09:51:31 +08:00
ibuler 3a71d7f1a8 fix(bug) 修复首页点击头像404问题 
处理结果，直接干掉连接
 2016-03-06 09:50:01 +08:00
liuzheng712 d48020a919 test 2016-03-04 23:59:18 +08:00
liuzheng712 210b3c8588 test 2016-03-04 23:57:39 +08:00
liuzheng712 bdf6d97478 test 2016-03-04 23:50:19 +08:00
liuzheng712 1ac9bebb8d fix: delete monkey patch 2016-03-04 23:17:19 +08:00
liuzheng712 ef3156e6f7 fix(test): monkey patch 2016-03-04 23:15:39 +08:00
liuzheng712 95a7557acf fix: 2016-03-04 20:42:08 +08:00
liuzheng712 8e30ffb840 fix(run_server.py): test if it invoke_shell bug 2016-03-04 20:40:37 +08:00
liuzheng712 20b5facc38 fix(webterminal): data 2016-03-04 20:30:58 +08:00
liuzheng712 f7eda41a54 fix(webterminal): data.data.data 2016-03-04 20:29:54 +08:00