Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev ... # Conflicts: # apps/jumpserver/urls.py # apps/locale/zh/LC_MESSAGES/django.po # apps/templates/_nav.html # requirements.txt # run_server.py		2016-11-24 17:57:50 +08:00
..
captcha	Modify translation	2016-09-05 20:17:45 +08:00
rest_framework	user-group edit serializer and url implement	2016-09-06 21:44:23 +08:00
_base_create_update.html	change user api	2016-11-09 19:29:15 +08:00
_base_list.html	add proxy log search	2016-11-05 01:15:25 +08:00
_foot_js.html	user-group detail: fix #15	2016-09-30 20:50:40 +08:00
_footer.html	Add login log	2016-11-10 23:54:21 +08:00
_head_css_js.html	fix #25	2016-09-30 18:25:50 +08:00
_header_bar.html	Merge with cmdb	2016-09-06 15:09:00 +08:00
_left_side_bar.html	Add user and send mail	2016-09-01 01:12:02 +08:00
_message.html	Add flash message template	2016-08-23 12:18:19 +08:00
_modal.html	user-group detail page: users op	2016-09-28 21:11:43 +08:00
_nav.html	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
_nav_user.html	Add user and send mail	2016-09-01 01:12:02 +08:00
_pagination.html	Asset group detail	2016-09-06 21:39:21 +08:00
_user_profile.html	Merge with cmdb	2016-09-06 15:09:00 +08:00
base.html	fix #25	2016-09-30 18:25:50 +08:00
flash_message_standalone.html	Stash	2016-11-06 21:29:04 +08:00
index.html	Add user and send mail	2016-09-01 01:12:02 +08:00