Commit Graph

85 Commits (1e26543f994304564080719c4bdd91679e2e221f)

Author SHA1 Message Date
guanghongwei 1e26543f99 添加头像 2015-02-28 23:24:10 +08:00
guanghongwei 1c96443e73 修改头像 2015-02-28 23:22:52 +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
guanghongwei f0cd064195 修改 用户左侧显示 2015-02-27 22:14:09 +08:00
guanghongwei 56f8f5d09b ޸ķҳ 2015-02-15 10:06:02 +08:00
guanghongwei 50208c0088 sudoȨ 2015-02-10 18:53:01 +08:00
guanghongwei d7de3edcf4 sudo޸Ȩ 2015-02-09 18:50:21 +08:00
guanghongwei c113035d3d sudo perm 2015-02-06 18:39:20 +08:00
guanghongwei 46cc593a9e Ȩ֧ 2015-02-03 23:03:51 +08:00
guanghongwei 0336bfa906 group_addʹajax 2015-02-01 23:03:28 +08:00
guanghongwei c1fb72f393 ޸ĵ½˳ 2015-01-30 23:30:16 +08:00
guanghongwei d25a3ce17c û޸ 2015-01-30 11:18:30 +08:00
guanghongwei b62bc9d161 û޸ĸһ 2015-01-28 18:00:09 +08:00
guanghongwei 6a8db89614 ޸һbug 2015-01-28 17:35:06 +08:00
guanghongwei 5cd09a6503 ޸ʱӳԱ 2015-01-28 15:08:16 +08:00
guanghongwei 5d38a1996c Կȥ 2015-01-28 11:17:29 +08:00
guanghongwei 2254e82bf0 ʾĬϵgroup 2015-01-27 18:53:37 +08:00
guanghongwei 047dda5ab3 ʾĬϵgroup 2015-01-27 17:56:51 +08:00
guanghongwei 3c8a9bab0c ޸ɾû 2015-01-27 17:30:20 +08:00
guanghongwei c782b46f32 û߼޸ 2015-01-27 17:24:33 +08:00
guanghongwei 5ddcdf99c1 ޸Ϣ 2015-01-27 15:01:09 +08:00
guanghongwei 95fbdce957 ޸bug 2015-01-24 13:49:52 +08:00
guanghongwei 7b0cea02bb ޸bug 2015-01-24 13:42:56 +08:00
guanghongwei d2669c2de0 ޸group edit 2015-01-24 13:34:36 +08:00
guanghongwei 08d42f1c2c ޸user_edit group_edit 2015-01-24 13:20:52 +08:00
guanghongwei 6d545565f6 鿴޸ 2015-01-24 12:54:25 +08:00
ibuler dc8f6d4d01 修改bug 2015-01-24 00:20:29 +08:00
ibuler ab4dab85cd 修改bug 2015-01-24 00:15:42 +08:00
ibuler c55c77e349 修改bug 2015-01-23 23:45:55 +08:00
ibuler 54d659edb6 修改bug 2015-01-23 23:40:37 +08:00
ibuler 2de8930034 修改bug 2015-01-23 23:37:15 +08:00
ibuler 16a051f4a0 修改bug 2015-01-23 23:27:06 +08:00
ibuler 3dca51d23c 修改用户信息 2015-01-23 22:44:29 +08:00
ibuler d5cf3935d8 修改bug 2015-01-23 00:46:35 +08:00
ibuler 327f3d6db1 修改bug 2015-01-23 00:45:45 +08:00
ibuler 49dcdf3be0 添加修改页面 2015-01-23 00:41:17 +08:00
ibuler f951471f1d 修改bug 2015-01-23 00:08:39 +08:00
ibuler 6b2310ff38 添加删除用户 2015-01-23 00:07:44 +08:00
ibuler 7e41f28864 修改bug 2015-01-23 00:00:29 +08:00
ibuler 68f67aecce 添加显示详情 2015-01-22 23:57:18 +08:00
ibuler cc72d59965 修改bug 2015-01-22 22:26:13 +08:00
ibuler 984a04972f 修改错误 2015-01-22 22:14:21 +08:00
ibuler cc425116a1 修改页面展示 2015-01-22 22:12:41 +08:00
root 244d0d2ba4 Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	jumpserver/templatetags/mytags.py
	juser/views.py
2015-01-21 23:05:42 +08:00
halcyon 7863a6853c 资产管理页面基本完成,尚有部分小bug 2015-01-19 10:09:16 +08:00
ibuler 46720dcf0f 修改bug 2015-01-14 23:58:25 +08:00
ibuler f592e46442 添加用户列表 2015-01-14 23:51:30 +08:00
ibuler 2200783de7 添加用户列表 2015-01-14 23:30:20 +08:00
ibuler 8a1e5376f7 修改添加用户bug 2015-01-14 23:08:29 +08:00
halcyon 1925cf4033 增加js判断 2015-01-14 19:19:56 +08:00