ibuler ccfe9b9d08 Merge branch 'admin-user'

2016-09-08 00:41:22 +08:00

..

templates/users

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

2016-09-07 21:53:33 +08:00

templatetags

merge master

2016-09-03 23:01:36 +08:00

tests

Update add->create edit->update and assetgrou->asset-grou etc format

2016-09-06 14:38:19 +08:00

__init__.py

Rename dir name dashboard to apps

2016-08-13 21:59:08 +08:00

api.py

user-group edit serializer and url implement

2016-09-06 21:44:23 +08:00

apps.py

add asset add

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

forms.py

Merge with cmdb

2016-09-06 15:09:00 +08:00

hands.py

Finish asset group create

2016-09-07 20:05:42 +08:00

models.py

Add admin user list view

2016-09-08 00:40:59 +08:00

serializers.py

user-group edit serializer and url implement

2016-09-06 21:44:23 +08:00

urls.py

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

2016-09-07 20:06:01 +08:00

utils.py

Merge with cmdb

2016-09-06 15:09:00 +08:00

views.py

refactor is_active trigger view and enable_otp trigger view in UserDetail page;trivial changes

2016-09-06 21:03:51 +08:00