江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ... Merge		2016-10-21 21:15:04 +08:00
..
assets	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2016-10-21 21:15:04 +08:00
audits	Finish command log	2016-10-19 01:05:28 +08:00
common	Add proxy log api	2016-10-18 19:28:36 +08:00
fixtures	Modify inital data	2016-10-02 22:16:15 +08:00
jumpserver	Add proxy log api	2016-10-18 19:28:36 +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 migrations	2016-10-02 22:13:08 +08:00
perms	Change auto_now to auto_now_add	2016-10-15 23:34:02 +08:00
static	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2016-10-21 21:15:04 +08:00
templates	Merge branch 'audits'	2016-10-19 15:14:07 +08:00
terminal	Add heatbeat	2016-10-18 23:49:04 +08:00
users	Change app name apps => terrminal	2016-10-17 15:24:41 +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