github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,834 Commits
65 Branches
246 Tags
105 MiB
Commit Graph

7834 Commits (d040b4cfe051b51a07f2e2b9995a43f5c6056ae6)

Author SHA1 Message Date
guanghongwei 1ea63bf3d0 ޸Ȩweb 2015-01-24 14:36:58 +08:00
root 3a9f0566b6 Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-01-24 13:58:31 +08:00
guanghongwei 81f80b4b0c Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-01-24 13:55:07 +08:00
halcyon 1a266f0b19 菜单active bug 2015-01-24 13:54:08 +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 b836a28e77 ޸bug 2015-01-24 12:55:20 +08:00
guanghongwei 6d545565f6 鿴޸ 2015-01-24 12:54:25 +08:00
halcyon 449bde4b03 菜单active 2015-01-24 12:13:49 +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 c54bc85b5c 修改显示 2015-01-22 23:24:13 +08:00
ibuler 43cea075dd 修改bug 2015-01-22 23:15:50 +08:00
ibuler be051afce9 修改对齐 2015-01-22 23:10:22 +08:00
ibuler c25e05b746 修改bug 2015-01-22 23:05:25 +08:00
ibuler 8543e885b7 修改bug 2015-01-22 23:04:59 +08:00
halcyon f335e35ba4 修改资产更改页面无法提交bug 2015-01-22 23:02:44 +08:00
ibuler 3cf352ee56 修改bug 2015-01-22 22:49:34 +08:00
ibuler 4f25124d92 修改分页 2015-01-22 22:46:48 +08:00
ibuler cc72d59965 修改bug 2015-01-22 22:26:13 +08:00
ibuler 9dc7e953c9 修改错误 2015-01-22 22:16:32 +08:00
ibuler 984a04972f 修改错误 2015-01-22 22:14:21 +08:00
ibuler cc425116a1 修改页面展示 2015-01-22 22:12:41 +08:00
ibuler 98061f9dce 修改bug 2015-01-22 00:17:12 +08:00
ibuler 81f7507bf2 添加查看授权页面 2015-01-22 00:16:28 +08:00
ibuler 736c58ce05 修改bug 2015-01-22 00:01:30 +08:00
ibuler a8ce9e9952 添加授权 2015-01-21 23:56:18 +08:00
ibuler 8bc7485c88 修改bug 2015-01-21 23:46:51 +08:00
ibuler 393871e214 修改bug 2015-01-21 23:45:28 +08:00
ibuler 53c3767b1b 添加授权页面 2015-01-21 23:44:14 +08:00
ibuler 234f378e3f 修改bug 2015-01-21 23:28:56 +08:00
ibuler 5957286d57 查看授权用户 2015-01-21 23:27:56 +08:00
ibuler f73f349153 修改nav.html 2015-01-21 23:23:44 +08:00
ibuler 59d034ce6e 添加查看权限用户 2015-01-21 23:22:21 +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
ibuler d878bb197f bug消除 2015-01-21 22:41:57 +08:00