Commit Graph

31 Commits (49861b6a84b1fc690e3abc3bc1d6eba7bbb7d838)

Author SHA1 Message Date
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile 2017-01-07 20:07:33 +08:00
ibuler 0907f5021e Finish form ajax submmit 2016-12-30 22:21:50 +08:00
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev
# Conflicts:
#	requirements.txt
2016-12-19 23:55:54 +08:00
ibuler 72ad4b44ce update bug 2016-11-24 19:36:49 +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 180af7e0bd Update csv 2016-11-22 00:59:49 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 10aa8c40a7 Add login log 2016-11-10 23:54:21 +08:00
ibuler f70abec5ef Finish user detail 2016-11-10 22:06:23 +08:00
ibuler a75e1db970 Add form validate 2016-11-07 00:39:26 +08:00
Administrator 97d7e6cb9b [future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口 2016-10-28 17:28:32 +08:00
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类 2016-10-27 15:20:16 +08:00
ibuler 0c8922e30f Modify some bug 2016-10-09 19:27:49 +08:00
ibuler 59727656c3 Update table desgin doc and audit log 2016-10-07 23:54:29 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +08:00
ibuler b54c973d82 Update requirement 2016-10-02 21:38:27 +08:00
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20 2016-10-01 20:26:43 +08:00
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
ibuler 1f3d763490 Add requirement 2016-09-24 11:44:59 +08:00
xiaokong1937@gmail.com db5d04c37f fix #13 2016-09-16 08:45:29 +08:00
xiaokong1937@gmail.com d8fe59debb temp save for issue 8 2016-09-08 21:51:44 +08:00
ibuler 2c11255828 Add capacha support 2016-09-02 22:21:26 +08:00
ibuler f7ab26a5da Add celery broker 2016-08-31 15:54:04 +08:00
ibuler c143735393 Add ssh-key-gen function 2016-08-31 01:00:20 +08:00
yumaojun03 f6b2abb1fb add ansible 2.0 2016-08-30 01:16:14 +08:00
liuzheng712 be92ac58ae merge 2016-08-24 06:48:50 +08:00
liuzheng712 1df0def9ea pip freeze 2016-08-24 06:47:14 +08:00
ibuler 9a6d20b6ec Modify requirement: add some module 2016-08-23 23:00:55 +08:00
xRain 7789c8d13d 增加了缺失的必需组件 2016-08-20 09:44:40 +08:00
ibuler 9493fb07cb Add user list view 2016-08-14 17:21:04 +08:00
ibuler 9303415b89 modify some issues 2016-08-14 00:40:21 +08:00