github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,039 Commits
99 Branches
262 Tags
144 MiB
Commit Graph

143 Commits (4959073a33c8e46bf6fe0684fdf93c39ce7e2af7)

Author SHA1 Message Date
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
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
root 284d5c79b0 chmod +x connect.py 2014-12-25 23:49:34 +08:00
ibuler bc78331d5b 基本完成 2014-12-25 23:49:08 +08:00
ibuler ab87420c9d 睡觉去了 2014-12-24 23:40:52 +08:00
ibuler 1f15f13aac 修改bUg 2014-12-24 23:17:51 +08:00
ibuler fe70ca80e6 修改bUg 2014-12-24 22:56:29 +08:00
ibuler 17ef381d7c 改名，修改bug 2014-12-24 22:42:47 +08:00
ibuler d7b2631410 修改名称 2014-12-24 22:21:46 +08:00
ibuler e66b1b4192 修改bug 2014-12-24 22:20:38 +08:00
ibuler 803dc9c576 准备完工 2014-12-24 00:21:47 +08:00
guanghongwei 99f95af74e modified settings.py set option 2014-12-22 18:34:08 +08:00
root 6a2e6709b9 add new app juser,jasset 2014-12-22 17:18:51 +08:00
guanghongwei 1e8d930ef0 del import module 2014-12-22 17:01:37 +08:00
guanghongwei e4c6823ee2 alert_print fuction 2014-12-22 16:55:49 +08:00
guanghongwei e2e32b4b37 add color print fuction 2014-12-22 16:38:10 +08:00
guanghongwei 7806db1d3f catch excepition 2014-12-22 16:22:04 +08:00
root f06422d5fa modify PS1 2014-12-22 15:56:19 +08:00
guanghongwei e0a0c1c641 Merge branch 'master' of gitcafe.com:ibuler/jumpserver 2014-12-22 15:32:25 +08:00
guanghongwei 8baff2c72d set PS1 2014-12-22 15:31:48 +08:00
root 4805d18fe9 modify connect.py mode 2014-12-22 14:54:43 +08:00
guanghongwei 988991a0ad rename jumpserver.py --> connect.py and add connect fucntion 2014-12-22 14:52:31 +08:00