9 Commits (775cd523eb2ef26c1775cd50cb89782e962dabf2)

Author	SHA1	Message	Date
Administrator	1bc88e5b11	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	8 years ago
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	8 years ago
ibuler	419876b575	Update heatbeat	8 years ago
ibuler	47090eb0f7	update some user api	8 years ago
Administrator	97d7e6cb9b	[future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口	8 years ago
ibuler	246fcb8efa	Modify run_server.py	8 years ago
ibuler	10d51ada37	Update login error message	8 years ago
ibuler	dcff84958f	Add run development server script: run_server.py	8 years ago
ibuler	3a9cf6c360	Add forget password and reset password	8 years ago