Commit Graph

119 Commits

Author SHA1 Message Date
ibuler
f00a2e003d Merge branch 'dev' into exec_cmd 2015-11-23 15:36:24 +08:00
ibuler
0b878216ed Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-23 15:34:34 +08:00
ibuler
f49a92e742 webscoket授权 2015-11-23 15:34:28 +08:00
kelianchun_miller
ee218a5fed update connect.py 2015-11-23 12:47:02 +08:00
ibuler
12f33176bf Merge branch 'dev' into exec_cmd 2015-11-22 21:59:18 +08:00
ibuler
eb779e5bf6 修改run_websocket 2015-11-22 21:59:07 +08:00
ibuler
70db8c69d2 global SSH_FLAG to self.ssh_flag 2015-11-22 20:45:48 +08:00
ibuler
4cdc7f33ce 添加注释 2015-11-22 20:20:32 +08:00
kelianchun_miller
c359d1e264 update connect.py 2015-11-22 20:20:04 +08:00
kelianchun_miller
0c42d039ff update connect.py 2015-11-22 20:18:33 +08:00
kelianchun_miller
55503c89e9 update connect.py 2015-11-22 19:15:58 +08:00
ibuler
93481a98db 完成登陆,批量执行命令流 2015-11-21 19:20:11 +08:00
ibuler
ab313aacd8 定义Command前 2015-11-20 18:42:44 +08:00
ibuler
cf8e366ae1 修改connect方法 2015-11-18 15:15:08 +08:00
ibuler
ce02d430ba deal_command添加到静态方法中 2015-11-16 23:33:44 +08:00
ibuler
f9c06c22ae 修改变量命名 2015-11-14 22:57:34 +08:00
kelianchun_miller
3d4443e1b0 update connect.py
命令处理进一步处理
2015-11-14 11:45:56 +08:00
kelianchun_miller
366a5d5737 update connect.py 2015-11-14 11:24:31 +08:00
ibuler
20970db404 修复环境变量大小写,修改terminal类 2015-11-13 21:15:41 +08:00
ibuler
d899360c34 增加websocket认证 2015-11-07 17:32:32 +08:00
ibuler
98c4d9bdba web terminal kill方法 2015-11-07 15:27:49 +08:00
ibuler
24730ebd0f web terminal记录日志 2015-11-07 13:38:50 +08:00
ibuler
01d6f751b1 解决实时监控特殊字符,使用term.js 2015-11-06 10:42:10 +08:00
ibuler
618aed3278 移动api中关于tty到connect.py 2015-11-04 17:04:25 +08:00
广宏伟
9366003f7b jlog 2015-10-26 22:17:16 +08:00
ibuler
913f93b91f 删除部门前 2015-08-26 23:31:32 +08:00
ibuler
c1facb939e 优化connect.py排序 2015-08-22 00:01:54 +08:00
ibuler
ad16d8b532 优化connect.py 和 api.py 2015-08-21 23:45:41 +08:00
Guang
9f0620f97e 调整User,UserGroup类 2015-08-20 23:42:27 +08:00
ibuler
f3a0c390b1 connect.py base ok 2015-06-16 09:21:11 +08:00
ibuler
bb32c0480c dev 2015-06-15 23:00:19 +08:00
ibuler
8d167baf46 modify some 2015-06-15 19:20:05 +08:00
ibuler
fdcaa358e5 modify some api.py bug 2015-06-13 00:36:10 +08:00
ibuler
5d16836b05 modify connect.py 2015-06-10 23:16:24 +08:00
ibuler
fc22677f3f modify some 2015-06-09 23:06:32 +08:00
ibuler
e979c2753b modify 1 2015-06-08 23:46:40 +08:00
何威
6998036bdc 修复当用户使用Ctrl+C结束进程时,没有正确退出 2015-05-22 17:18:37 +08:00
ibuler
e09cb10439 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 17:22:26 +08:00
ibuler
caa318b808 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 16:40:36 +08:00
ibuler
00f7346578 resolve connect.py string start with g bug 2015-04-28 16:54:58 +08:00
ibuler
c01a489dce modify service.sh bug 2015-04-24 18:19:43 +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
ea37374ea5 django 1.6 2015-04-20 18:56:30 +08:00
ibuler
412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler
17e89bb55b ޸һbug 2015-04-19 18:26:38 +08:00
ibuler
c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
ibuler
bcc5774365 ӳɹҳ 2015-04-18 13:52:28 +08:00
guanghongwei
78f00e5c5f ϴļ 2015-04-09 23:49:21 +08:00
guanghongwei
ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00