Commit Graph

70 Commits

Author SHA1 Message Date
guanghongwei
ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00
halcyon
bb94cfc7a1 完善 2015-04-08 17:31:07 +08:00
guanghongwei
d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
2015-03-21 13:10:38 +08:00
guanghongwei
e717fad762 ȵ 2015-03-19 23:57:08 +08:00
halcyon
fef224459c 鉴权 2015-03-19 18:32:10 +08:00
root
fa0ec1e7d7 connect 2015-03-17 23:20:25 +08:00
halcyon
98dfebc3aa jlog 2015-03-17 17:18:41 +08:00
halcyon
9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei
026836ebc5 2015-03-14 17:54:17 +08:00
guanghongwei
d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
halcyon
ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
guanghongwei
5749276812 Ȩ޹ 2015-03-13 18:36:35 +08:00
guanghongwei
9a638bc856 修改一些bug 2015-03-07 17:37:26 +08:00
halcyon
08410820ab 03-01 2015-03-01 12:16:14 +08:00
guanghongwei
b7acef8cb0 授权收尾工作 2015-02-13 00:00:07 +08:00
halcyon
c84f124511 bug 2015-02-09 19:02:25 +08:00
guanghongwei
d7de3edcf4 sudo޸Ȩ 2015-02-09 18:50:21 +08:00
halcyon
433974d77d 改bug 2015-02-05 18:53:57 +08:00
guanghongwei
0336bfa906 group_addʹajax 2015-02-01 23:03:28 +08:00
root
2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
guanghongwei
35d9be5c10 connect.py޸ 2015-01-30 16:53:06 +08:00
ibuler
c460323c5b 修改授权web
映射去掉 user_common 和 password_common ===
2015-01-25 23:38:58 +08:00
halcyon
d1f6ed4a55 增加日志查看功能 2015-01-25 22:20:07 +08:00
ibuler
bc5b32bcea 添加useradd的函数 2015-01-12 23:52:41 +08:00
halcyon
ccb4876d88 修改bug 2015-01-04 11:12:38 +08:00
ibuler
caabc04ffe 添加支持readline 2015-01-03 09:52:52 +08:00
ibuler
bbc407660d 修改bug 2015-01-01 09:15:01 +08:00
ibuler
d1358b3d4f 修改bug 2015-01-01 08:44:46 +08:00
ibuler
2eaf6d7d81 修改bug 2014-12-31 23:02:03 +08:00
ibuler
73da287c6c 优化代码 2014-12-31 22:58:37 +08:00
ibuler
9ba7ad147a 修改multi拼写错误 2014-12-31 00:11:12 +08:00
root
b1e0a24184 Merge branch 'ssh_key'
Conflicts:
	connect.py
2014-12-30 23:59:27 +08:00
ibuler
894911126b 添加异常处理 2014-12-30 23:51:00 +08:00
ibuler
0b97c19862 修改bug 2014-12-30 23:22:57 +08:00
ibuler
89e2133341 serve active and user active 2014-12-30 22:52:39 +08:00
ibuler
3f4a7225b1 修改bug,增加ssh_key和普通密码登陆 2014-12-30 22:48:39 +08:00
halcyon
bd9049deb6 增加批量执行命令功能 2014-12-30 22:48:18 +08:00
ibuler
d316b08b6d 修改bug 2014-12-30 00:05:03 +08:00
ibuler
6c2b782964 支持ssh-key 2014-12-29 23:50:56 +08:00
ibuler
731196094b 添加解密时异常处理 2014-12-28 19:57:48 +08:00
ibuler
fead462124 修改登录名和记录日志不一样的问题 2014-12-28 00:34:05 +08:00
ibuler
42d14ee1d6 修改bug 2014-12-28 00:14:10 +08:00
ibuler
8677b0d18d 修改bug 2014-12-27 23:54:37 +08:00
ibuler
aa4c02cfcd 添加测试用户 2014-12-27 16:52:31 +08:00
ibuler
19bd6652af 修改bug 2014-12-26 23:59:12 +08:00
ibuler
0d48884e19 记录日志 2014-12-26 23:58:11 +08:00
ibuler
9609bad31c 修改import 的序列 2014-12-26 21:55:56 +08:00
ibuler
f73ba9cc4a 显示id 2014-12-26 21:39:05 +08:00
ibuler
4eec31e42d 修改显示1 2014-12-26 00:11:13 +08:00
ibuler
8d7ab7b1b0 修改bug 2014-12-25 23:52:52 +08:00