Commit Graph

95 Commits (5e20ac0454d8da9251823c68777af3d6ea97aed1)

Author SHA1 Message Date
广宏伟 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
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