ibuler
|
9c6c6d6b4c
|
[Feature] 添加Dockerfile
|
2017-01-07 20:07:33 +08:00 |
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
|
2016-11-24 18:22:36 +08:00 |
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 |
ibuler
|
419876b575
|
Update heatbeat
|
2016-11-13 22:34:38 +08:00 |
ibuler
|
47090eb0f7
|
update some user api
|
2016-11-09 23:49:10 +08:00 |
Administrator
|
97d7e6cb9b
|
[future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口
|
2016-10-28 17:28:32 +08:00 |
ibuler
|
246fcb8efa
|
Modify run_server.py
|
2016-09-04 19:10:28 +08:00 |
ibuler
|
10d51ada37
|
Update login error message
|
2016-09-03 00:39:06 +08:00 |
ibuler
|
dcff84958f
|
Add run development server script: run_server.py
|
2016-09-01 23:10:28 +08:00 |
ibuler
|
3a9cf6c360
|
Add forget password and reset password
|
2016-09-01 23:09:58 +08:00 |