右书僮 b34c5dde40 Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ...

# Conflicts:
#	apps/assets/templates/assets/asset_list.html

2017-03-27 08:03:23 +08:00

..

applications

[Fixture] 拆分proxy log 为在线和离线

2017-03-24 14:23:51 +08:00

assets

Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver

2017-03-27 08:03:23 +08:00

audits

[Fixture] 拆分proxy log 为在线和离线

2017-03-24 14:23:51 +08:00

common

[Change] 修改一些view

2017-03-24 00:27:33 +08:00

fixtures

[Update] 更新生成fake数据脚本

2017-03-22 23:36:43 +08:00

jumpserver

[Change] 修复验证码模糊度

2017-03-24 23:13:17 +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

[Change] 修改一些view

2017-03-24 00:27:33 +08:00

perms

[Change] 修改一些view

2017-03-24 00:27:33 +08:00

static

Merge with audits

2017-03-01 15:35:11 +08:00

templates

[Change] 修复验证码模糊度

2017-03-24 23:13:17 +08:00

users

[Bugfix] 修改一些bug

2017-03-04 16:38:26 +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