Commit Graph

449 Commits

Author SHA1 Message Date
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
ibuler
6bd0ed4344 修改bug 2015-01-21 22:40:50 +08:00
ibuler
6635ccb603 修改bug 2015-01-21 22:38:55 +08:00
ibuler
a0688274b6 查看实例 2015-01-21 22:33:31 +08:00
ibuler
c569afb5da 修改bug 2015-01-21 22:23:57 +08:00
ibuler
b01964618d 获得role tag 2015-01-21 22:23:05 +08:00
halcyon
9b194946c3 修改添加组不选没有提示bug 2015-01-21 18:54:31 +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
halcyon
6b95c7ed6f 资产详情弹窗 2015-01-14 16:39:57 +08:00
ibuler
7435d602dd 修改添加用户bug 2015-01-13 23:15:40 +08:00
ibuler
2b6c2cd6fc 修改bug 2015-01-13 22:57:27 +08:00
ibuler
84a48d3aec 修改bug 2015-01-13 22:44:58 +08:00
ibuler
14da0f18ab 添加用户完成 2015-01-13 22:14:50 +08:00
ibuler
bc5b32bcea 添加useradd的函数 2015-01-12 23:52:41 +08:00
halcyon
acf508f074 资产管理页面基本完成. 2015-01-11 19:27:21 +08:00
ibuler
f45398e20b 修改默认 2015-01-10 23:39:43 +08:00
ibuler
9304a911ea 添加自定义tag 2015-01-10 23:31:32 +08:00
guanghongwei
fbde8d42fe ޸bug 2015-01-10 16:48:34 +08:00
guanghongwei
8875cb2f9e ޸bug 2015-01-10 16:28:09 +08:00
guanghongwei
8c9e763f74 Ĭֵ 2015-01-10 16:24:44 +08:00
guanghongwei
97dcb4ca91 Locals 2015-01-10 15:54:09 +08:00