Commit Graph

84 Commits (50d2bfb27200f44c4eedb5a7a26f46829101a39c)

Author SHA1 Message Date
ibuler@qq.com 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00
ibuler@qq.com e99b33c51e 修改使用新表结构 2015-10-06 23:47:53 +08:00
Administrator 43fe985143 添加组授权 2015-10-06 18:51:49 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 33c624c76f 删除部门后 2015-08-27 00:08:20 +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
guanghongwei afcc784797 ޸û 2015-04-04 12:48:26 +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
guanghongwei 340aaf42de ˢ 2015-03-27 16:34:00 +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