wangyong 42012d7bfe merge master

2016-09-16 17:32:35 +08:00

..

assets

merge master

2016-09-16 17:32:35 +08:00

audits

add asset add

2016-09-03 19:05:50 +08:00

common

Modify and code review

2016-09-15 11:19:36 +08:00

fixtures

Add fake data to init.json

2016-09-15 12:21:34 +08:00

jumpserver

fix #13

2016-09-16 08:45:29 +08:00

locale/zh/LC_MESSAGES

merge master

2016-09-16 17:32:35 +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

Modify some style

2016-09-15 12:20:53 +08:00

static

Move js to jumpserver.js

2016-09-15 13:09:24 +08:00

templates

Move js to jumpserver.js

2016-09-15 13:09:24 +08:00

users

change user ssh reset type from private key to public key

2016-09-15 16:54:00 +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