guanghongwei 419ee2660a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: jumpserver/urls.py jumpserver/views.py		2015-04-09 11:32:32 +08:00
..
jasset	bugs	2015-04-09 11:09:18 +08:00
jlog	apply	2015-03-26 18:42:52 +08:00
jperm	添加上传	2015-04-09 11:27:36 +08:00
juser	修改密钥密码后重新生成key, 普通用户首页	2015-04-08 17:32:56 +08:00
404.html	鈥�
500.html	鈥�
base.html	鈥�
filter_ajax_api.html	鈥�
foot_script.html	添加上传	2015-04-09 11:27:36 +08:00
footer.html	修改用户详情	2015-04-01 22:54:10 +08:00
head_script.html	添加上传	2015-04-09 11:27:36 +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-04-09 11:27:36 +08:00
login.html	鈥�
nav.html	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-08 17:38:30 +08:00
nav_bar_header.html	鈥�
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	鈥�
paginator_new..html	鈥�
skin_config.html	鈥�
test.html	鈥�
upload.html	添加上传	2015-04-09 11:27:36 +08:00