江世峰 0dec647116 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver ... rollback user_list.html		2016-09-28 13:45:03 +08:00
..
assets	assets_group_forbug	2016-09-28 12:05:34 +08:00
audits	add asset add	2016-09-03 19:05:50 +08:00
common	Merge with asset	2016-09-20 00:43:30 +08:00
fixtures	Add fake data to init.json	2016-09-15 12:21:34 +08:00
jumpserver	update assets_group	2016-09-19 17:25:41 +08:00
locale/zh/LC_MESSAGES	Modify asset create	2016-09-19 00:07:52 +08:00
media/avatar	add asset add	2016-09-03 19:05:50 +08:00
ops	add asset add	2016-09-03 19:05:50 +08:00
perms	add __init__.py	2016-09-24 22:12:49 +08:00
static	trivial changes: refactor the jumpserver DataTable api	2016-09-27 21:28:02 +08:00
templates	fix #27	2016-09-27 20:16:46 +08:00
terminal/migrations	add __init__.py	2016-09-24 22:12:49 +08:00
users	rollback user_list.html	2016-09-28 13:44:51 +08:00
webterminal	add asset add	2016-09-03 19:05:50 +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