江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver ...

merge

2016-09-30 18:26:02 +08:00

..

assets

fix #25

2016-09-30 18:25:50 +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

user-group detail page: users op

2016-09-28 21:11:43 +08:00

templates

Merge branch 'master' of code.simcu.com:jumpserver/jumpserver

2016-09-30 18:26:02 +08:00

terminal/migrations

add __init__.py

2016-09-24 22:12:49 +08:00

users

user-group-detail: user-adding frontend integration

2016-09-29 21:14:55 +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