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

..

jasset

添加组修改，组内删除主机并不删除真实机

2015-02-03 22:45:51 +08:00

jlog

批量添加删除功能实现，修改资产添加修改等

2015-02-01 23:00:23 +08:00

jperm

�޸ķ�ҳ

2015-02-15 10:06:02 +08:00

juser

�޸ķ�ҳ

2015-02-15 10:06:02 +08:00

404.html

使用 陈文平的html

2015-01-03 22:24:34 +08:00

500.html

使用 陈文平的html

2015-01-03 22:24:34 +08:00

base.html

�޸�jsλ��

2015-01-31 13:45:58 +08:00

foot_script.html

����Ȩ��֧������

2015-02-03 23:03:51 +08:00

footer.html

添加修改页面

2015-01-23 00:41:17 +08:00

head_script.html

����Ȩ��֧������

2015-02-03 23:03:51 +08:00

link_css.html

修改组方面授权

2015-01-27 00:14:50 +08:00

login.html

�޸ĵ�½�˳�

2015-01-30 23:30:16 +08:00

nav_bar_header.html

�޸ĵ�½�˳�

2015-01-30 23:30:16 +08:00

nav_cat_bar.html

修改授权详情

2015-02-11 23:32:24 +08:00

nav_li_profile.html

修改 用户左侧显示

2015-02-27 22:14:09 +08:00

nav.html

������Ȩ����

2015-02-11 18:38:56 +08:00

skin_config.html

添加 skin_config.html

2015-01-05 22:39:14 +08:00

test.html

group_addʹ��ajax

2015-02-01 23:03:28 +08:00