Commit Graph

74 Commits (18da6f69a22bfa10ff82b655d50a70305274efd8)

Author SHA1 Message Date
yumaojun d040e2719f 修复Role 删除时 秘钥问题等异常引起的Bug 2015-12-26 10:12:00 +08:00
yumaojun d604639b96 修复添加role 时 因私钥格式不对而引起的bug(2) 2015-12-22 23:05:38 +08:00
yumaojun 3248ee1a3d 修复添加role 时 因私钥格式不对而引起的bug 2015-12-22 22:39:59 +08:00
ibuler 39b7a7290f merge with dev 2015-12-19 17:30:21 +08:00
ibuler c103738302 merge with dev 2015-12-19 17:26:34 +08:00
ibuler f7e70e56e3 modify sudo conn timeout bug 2015-07-03 21:09:17 +08:00
ibuler 7cb4ff97ea modify cmd_edit bug 2015-06-11 14:01:49 +08:00
ibuler dcfd4e05ec modify sudo cmd bug 2015-06-04 10:15:41 +08:00
ibuler ce99bf2266 placeholder 2015-05-25 18:35:32 +08:00
ibuler 1952d1ca23 modify sudo show 2015-05-25 18:27:57 +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
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon a269c43d1c 优化 2015-04-16 19:03:02 +08:00
halcyon 29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
guanghongwei c08cee8052 û 2015-04-15 17:32:30 +08:00
guanghongwei 3424bef5d0 ޸bug 2015-04-15 12:07:59 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00
guanghongwei 7e53228359 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-04 12:48:56 +08:00
halcyon 6e976b0583 0406 2015-04-04 12:47:07 +08:00
guanghongwei 8f66de365e merge with wangyong 2015-04-02 20:40:54 +08:00
halcyon b35f1e6174 权限申请 2015-04-02 18:32:43 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
guanghongwei 38445a1dd2 Ұ 2015-03-27 18:37:10 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
guanghongwei 59414dadfc ˢsudosudoûȨ 2015-03-25 18:45:55 +08:00
guanghongwei 0c31968e3c 2015-03-23 22:57:19 +08:00
guanghongwei a2ede31ae6 Ȩʼ 2015-03-15 23:23:20 +08:00
guanghongwei 026836ebc5 2015-03-14 17:54:17 +08:00
guanghongwei a7800b9a7a Ȩ޹ 2015-03-13 00:09:18 +08:00
guanghongwei 475501595e ҳ 2015-03-12 18:43:17 +08:00
guanghongwei 546393d9c3 Ȩ޸ 2015-03-11 23:46:35 +08:00
guanghongwei 80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei
Conflicts:
	jperm/models.py
2015-03-11 18:00:55 +08:00
guanghongwei ae0c28ef8f 2015-03-11 17:59:15 +08:00
guanghongwei 5c54128f8d ޸ĺܶ, 2015-03-11 10:18:20 +08:00
guanghongwei 8f163eb634 统一分页 2015-03-07 18:25:31 +08:00
guanghongwei 9a638bc856 修改一些bug 2015-03-07 17:37:26 +08:00
guanghongwei a94c050fd9 完工,睡觉 2015-03-07 00:12:38 +08:00
guanghongwei 07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
guanghongwei 50fcac67c3 修改 删除等 2015-03-03 22:44:00 +08:00
guanghongwei fb1c17dc51 修改bug 2015-03-01 15:01:15 +08:00
guanghongwei 9bab7bf1e7 Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	jperm/views.py
	jumpserver/views.py
2015-02-28 21:26:23 +08:00