github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,145 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

5145 Commits (420f3c0c4c8aa73f3bdf6cdb2aa54d6f794617a4)

Author SHA1 Message Date
ibuler 67b2467bc9 Merge branch 'guanghongwei' 2015-05-25 10:10:49 +08:00
ibuler 345be469fa Merge branch 'wangyong' 2015-05-25 10:07:25 +08:00
halcyon 04522c0b80 修改port字段 2015-05-25 10:03:55 +08:00
蓝枫 4a9e002440 Merge pull request #6 from losswei/master 
修复当用户使用Ctrl+C结束进程时,没有正确退出
 2015-05-22 17:24:46 +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 58fd4374c7 Merge branch 'wangyong' 2015-05-15 12:01:51 +08:00
ibuler f89d444ddf modify requirements.txt 2015-05-15 11:53:31 +08:00
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug 2015-05-14 18:02:20 +08:00
ibuler 00f7346578 resolve connect.py string start with g bug 2015-04-28 16:54:58 +08:00
ibuler b1add204b6 ޸ʾ 2015-04-28 15:08:28 +08:00
ibuler 6d34bd45d2 modify nav_bar_header.html 2015-04-24 20:42:15 +08:00
ibuler 992947ac99 modify service.sh bug 2015-04-24 20:39:44 +08:00
ibuler ba55cdde87 modify service.sh bug 2015-04-24 19:12:14 +08:00
ibuler c01a489dce modify service.sh bug 2015-04-24 18:19:43 +08:00
ibuler 0beb683c40 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-23 11:23:05 +08:00
root b134c90bfd 解决阻断报错问题 2015-04-23 11:20:12 +08:00
ibuler 6c10cf1a5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-22 18:58:26 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
halcyon 8a8f68d908 使用username 去掉log_ha里的print 2015-04-22 18:04:23 +08:00
halcyon b7aa1ab3dc jperm问题 2015-04-22 17:50:46 +08:00
halcyon 27d6df7a38 解决django低版本不支持first()问题 2015-04-21 14:45:38 +08:00
ibuler 8f7e1bfc38 modify readme 2015-04-20 22:55:26 +08:00
ibuler 7accf70e17 ӽű 2015-04-20 21:17:16 +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 a203b89ad4 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-20 15:57:33 +08:00
ibuler 0a8198b2ca ޸Ƴbug 2015-04-20 15:57:10 +08:00
ibuler d84ff97019 ޸Ƴbug 2015-04-20 15:56:49 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
halcyon b65f620ff7 hehe 2015-04-19 23:14:51 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
ibuler 76b1bf2c39 Խűȥע 2015-04-19 18:39:15 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler 17e89bb55b ޸һbug 2015-04-19 18:26:38 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
ibuler c8d91884c8 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jumpserver/api.py
 2015-04-18 18:06:17 +08:00
halcyon bd2d7ce007 hehe 2015-04-18 18:04:03 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
ibuler 0873211d13 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-18 14:02:57 +08:00
ibuler bcc5774365 ӳɹҳ 2015-04-18 13:52:28 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
ibuler d6171f7fe7 merge 2015-04-18 12:37:55 +08:00
ibuler 9acba2ddf0 ɾûõ 2015-04-18 12:36:16 +08:00