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
..
jasset	修改bug，实时搜索完成	2015-04-07 19:15:45 +08:00
jlog	apply	2015-03-26 18:42:52 +08:00
jperm	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-08 17:38:30 +08:00
juser	�޸���Կ�������������key, ��ͨ�û���ҳ	2015-04-08 17:32:56 +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
filter_ajax_api.html	�޸ĺܶ�����,����������	2015-03-11 10:18:20 +08:00
foot_script.html	鉴权	2015-03-19 18:32:10 +08:00
footer.html	�޸��û�����	2015-04-01 22:54:10 +08:00
head_script.html	dashboard等	2015-02-11 17:53:17 +08:00
index.html	修改bug，实时搜索完成	2015-04-07 19:15:45 +08:00
index_cu.html	�޸���Կ�������������key, ��ͨ�û���ҳ	2015-04-08 17:32:56 +08:00
link_css.html	鉴权	2015-03-19 18:32:10 +08:00
login.html	�޸ĵ�½�˳�	2015-01-30 23:30:16 +08:00
nav.html	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-08 17:38:30 +08:00
nav_bar_header.html	�޸ĺܶ�����	2015-03-03 18:42:06 +08:00
nav_cat_bar.html	�����л�	2015-03-30 21:31:02 +08:00
nav_li_profile.html	�û��������ͨ�û�	2015-04-06 23:04:31 +08:00
paginator.html	���������	2015-03-14 17:54:17 +08:00
paginator_new..html	��Ȩ��ʼ	2015-03-15 23:23:20 +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