guanghongwei b840db12a6 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver ...

Conflicts:
	jasset/views.py
	jumpserver/views.py

2015-04-08 17:38:30 +08:00

..

dept_perm_edit.html

�޸��û�����

2015-04-04 12:48:26 +08:00

dept_perm_list.html

管理员仪表盘基本完成

2015-04-05 22:52:37 +08:00

perm_add.html

��Ȩ�޸�

2015-03-11 23:46:35 +08:00

perm_apply_exec.html

0406

2015-04-04 12:47:07 +08:00

perm_apply_info.html

0406

2015-04-04 12:47:07 +08:00

perm_apply_search.html

0406

2015-04-04 12:47:07 +08:00

perm_apply.html

修改bug，实时搜索完成

2015-04-07 19:15:45 +08:00

perm_asset_detail.html

今天到此为止

2015-03-06 00:24:17 +08:00

perm_detail.html

�û��������ͨ�û�

2015-04-06 23:04:31 +08:00

perm_edit_bak.html

������Ȩ����

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

perm_edit.html

�����ҳ����

2015-03-12 18:43:17 +08:00

perm_list_ajax.html

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

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

perm_list.html

管理员仪表盘基本完成

2015-04-05 22:52:37 +08:00

perm_log_offline.html

修改bug，实时搜索完成

2015-04-07 19:15:45 +08:00

perm_log_online.html

修改bug，实时搜索完成

2015-04-07 19:15:45 +08:00

perm_log.html

apply

2015-03-26 18:42:52 +08:00

perm_user_detail.html

今天到此为止

2015-03-06 00:24:17 +08:00

sudo_add.html

����Ȩ�޹���

2015-03-13 00:09:18 +08:00

sudo_cmd_add.html

ˢ��sudo��sudo�û���Ȩ

2015-03-25 18:45:55 +08:00

sudo_cmd_list.html

ˢ��sudo��sudo�û���Ȩ

2015-03-25 18:45:55 +08:00

sudo_detail.html

修改一些bug

2015-03-07 17:37:26 +08:00

sudo_edit.html

ˢ��sudo��sudo�û���Ȩ

2015-03-25 18:45:55 +08:00

sudo_list.html

修改bug，实时搜索完成

2015-04-07 19:15:45 +08:00