github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,741 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

383 Commits (097ebc2362f07b6bebd7ea0470ead93d3c3832cb)

Author SHA1 Message Date
Administrator 2494fa5846 修改url 2016-11-24 22:34:55 +08:00
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题 2016-11-24 22:10:04 +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
Administrator 7c4aefd959 兼容py3测试 2016-11-24 17:10:43 +08:00
Administrator cd22c39078 [future] 将Task移到一个包内管理 2016-11-23 11:45:50 +08:00
Administrator 32a5aec34e [future] 调整app架构 2016-11-22 23:02:12 +08:00
Administrator 18e0fee1a7 [future] 添加作业中心基础框架 2016-11-22 21:08:45 +08:00
Administrator 954814da65 [future] 添加Cron相关的基础API框架 2016-11-22 10:41:18 +08:00
Administrator 79971d677d [future] 使用mixin去掉重复多余代码 2016-11-20 18:12:18 +08:00
Administrator 1e835d2fa9 [future] 增加503和501的自定义异常 2016-11-20 16:23:45 +08:00
Administrator 76f72dfb58 [future] 添加路由, 增加api认证, 测试所有添加的api 2016-11-20 16:22:41 +08:00
Administrator 5ae2711c6e sudo privilege删除走api 2016-11-20 14:48:18 +08:00
Administrator 39ae4a3a10 [future] url 调整 2016-11-20 12:22:56 +08:00
Administrator 961ecb3ee8 [future] 添加sudo相关的api方法 2016-11-20 12:18:44 +08:00
ibuler aff37092bf Rename urls 2016-11-16 18:12:14 +08:00
Administrator c588436d55 初始化模板和api模块 2016-11-16 15:00:46 +08:00
Administrator 82412831d5 initial sudo views 2016-11-16 14:20:44 +08:00
Administrator d9278c2c24 [future] 添加sudo相关的表，以及实现生成sudo内容的方法 2016-11-05 13:10:44 +08:00
Administrator 8716d9c725 [future] 添加用于记录sudo相关的表 2016-11-04 18:12:10 +08:00
Administrator 1fd0f8fdde [future] 添加sudo的配置模板 2016-11-03 18:26:10 +08:00
Administrator 92f396761c [future] 完成获取硬件和链接测试的第一版v1 
1. 完成数据结果的封装, 添加数据结构样列
2. 完成硬件和链接测试接口v1版
 2016-11-01 10:37:03 +08:00
Administrator 97b8bcd5ca [future] 
1. settings 添加ops 的logger, 关于Ansible的log单独记录
2. models 增加Tasker模型, 添加AnsibleHostReuslt 对于数据处理的方法
3. ansible_api, callback 类，增加保存Tasker的逻辑,i其他兼容
4. taskers, 实现获取硬件信息和ping的 tasker接口。
 2016-10-31 17:41:26 +08:00
Administrator ccf3851d81 [future] 初步添加测试链接的接口 2016-10-28 17:43:56 +08:00
Administrator 97d7e6cb9b [future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口 2016-10-28 17:28:32 +08:00
Administrator fd945513ac [fix] 修改模型的显示, 因为字段默认会加上Class的Name 2016-10-28 15:47:37 +08:00
Administrator 51c530c123 [future] ansible运行结果存入数据库 2016-10-28 14:58:09 +08:00
Administrator 96bc1cd8f1 [future]ansible运行结果存入数据库中... 2016-10-28 13:41:11 +08:00
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类 2016-10-27 15:20:16 +08:00
Administrator 13f34a8bdd ops: [future]完成ansible2.0 API 的基本封装. 2016-10-25 18:15:02 +08:00
ibuler 6b6105491c Add migrations 2016-10-02 22:13:08 +08:00
wangyong 77f3a1f146 add asset add 2016-09-03 19:05:50 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00