ibuler 4d96978b4f Merge branch 'master' into audits		2016-12-20 23:08:09 +08:00
..
assets	merged	2016-12-20 23:07:33 +08:00
audits	修改token获取，拆分认证文件和权限文件	2016-12-20 01:19:50 +08:00
common	Base finish user	2016-11-25 11:00:51 +08:00
fixtures	Add fake	2016-12-06 10:40:17 +08:00
jumpserver	Merge branch 'master' into audits	2016-12-20 23:08:09 +08:00
locale/zh/LC_MESSAGES	添加作业中心i18n	2016-11-22 21:40:05 +08:00
media	Update user import and export	2016-11-24 15:45:08 +08:00
ops	补充task需要的一些接口	2016-12-19 23:46:03 +08:00
perms	修改token获取，拆分认证文件和权限文件	2016-12-20 01:19:50 +08:00
static	Merge remote-tracking branch 'origin/master' into ops_dev	2016-12-19 23:55:54 +08:00
templates	ansible Task接口更上层抽象的基本实现	2016-12-19 14:07:21 +08:00
terminal	修改token获取，拆分认证文件和权限文件	2016-12-20 01:19:50 +08:00
users	merged	2016-12-20 23:07:33 +08:00
__init__.py	add asset add	2016-09-03 19:05:50 +08:00
manage.py	update	2016-09-04 07:04:15 +08:00