Commit Graph

427 Commits (d56f030dc45fa3b9db429c9081455e6264a63a54)

Author SHA1 Message Date
Administrator 32a5aec34e [future] 调整app架构 2016-11-22 23:02:12 +08:00
Administrator fea76178ee 添加作业中心i18n 2016-11-22 21:40:05 +08:00
Administrator 3abe2196dd [future] 添加作业中心 i18n相关 2016-11-22 21:38:38 +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
ibuler 180af7e0bd Update csv 2016-11-22 00:59:49 +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 205c11dfba Finish list paganation 2016-11-18 12:00:23 +08:00
ibuler e89d3b3807 Update asset 2016-11-17 19:28:45 +08:00
ibuler aff37092bf Rename urls 2016-11-16 18:12:14 +08:00
ibuler 5745c8cc4a Finish url namespace change 2016-11-16 17:45:46 +08:00
ibuler a5e487441f prepare change api name 2016-11-16 17:38:03 +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
ibuler aa08f0aa48 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits 2016-11-16 12:34:01 +08:00
ibuler 32d12b7f78 Update user group asset permission 2016-11-16 12:33:54 +08:00
ibuler 3b30eb3278 Weiteng 2016-11-15 23:09:36 +08:00
ibuler 99c36f2a2c Fix bug 2016-11-15 19:44:08 +08:00
ibuler db8b0022fc Update usergroup detail 2016-11-15 19:33:04 +08:00
ibuler bd882c8bef User group detail 2016-11-15 00:48:48 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 419876b575 Update heatbeat 2016-11-13 22:34:38 +08:00
ibuler 2635217421 Update celery 2016-11-11 09:48:47 +08:00
ibuler c6fc3dfe91 Update terminal interval 2016-11-11 02:13:13 +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 69f2bf664b Finish user permission revoke 2016-11-10 16:59:50 +08:00
ibuler dde9ffb2ae Update perm api 2016-11-10 00:18:57 +08:00
ibuler 47090eb0f7 update some user api 2016-11-09 23:49:10 +08:00
ibuler c5d625e261 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits 2016-11-09 19:29:26 +08:00
ibuler 8d7759d22f change user api 2016-11-09 19:29:15 +08:00
ibuler 0d4d64c274 Update api 2016-11-09 00:36:23 +08:00
ibuler ea3f8af161 Fix pubkey auth bug 2016-11-07 16:59:52 +08:00
ibuler a75e1db970 Add form validate 2016-11-07 00:39:26 +08:00
ibuler 072da114db Finish system user list 2016-11-06 22:45:26 +08:00
ibuler 968b1b4cb6 Stash 2016-11-06 21:29:04 +08:00
ibuler afb923737c Merge with audits 2016-11-06 11:52:25 +08:00
ibuler 79c8f2275c Update perm api 2016-11-05 23:34:45 +08:00
Administrator d9278c2c24 [future] 添加sudo相关的表,以及实现生成sudo内容的方法 2016-11-05 13:10:44 +08:00
ibuler 5b0f897118 Update proxy log and command log view 2016-11-05 12:45:59 +08:00
ibuler 41337d28c3 add proxy log search 2016-11-05 01:15:25 +08:00
ibuler 1d29c52a43 Update datatable 2016-11-04 19:25:10 +08:00
ibuler 53e97dac40 stash it 2016-11-04 18:33:16 +08:00
Administrator 8716d9c725 [future] 添加用于记录sudo相关的表 2016-11-04 18:12:10 +08:00
ibuler 2a65e81316 detail page add update 2016-11-03 23:16:16 +08:00
ibuler f437d3f883 update 2016-11-03 19:42:47 +08:00
Administrator 1fd0f8fdde [future] 添加sudo的配置模板 2016-11-03 18:26:10 +08:00
ibuler 61eadf6891 Modify asset detail 2016-11-03 00:09:38 +08:00
ibuler 3448f3eb0a Modify init data 2016-11-02 23:00:47 +08:00
ibuler 05a5e9cc69 Finish some bug 2016-11-02 19:44:11 +08:00
ibuler 34a0a37b63 Add token 2016-11-01 19:31:35 +08:00
ibuler 1159d9494c Update signer 2016-11-01 17:21:16 +08:00
Administrator 92f396761c [future] 完成获取硬件和链接测试的第一版v1
1. 完成数据结果的封装, 添加数据结构样列
2. 完成硬件和链接测试接口v1版
2016-11-01 10:37:03 +08:00
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +08:00
ibuler 315af35296 Finish token access api 2016-10-31 18:58:23 +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
江世峰 6b6fdcd5fd asset:add assets_bulk_update 2016-10-28 21:24:01 +08:00
江世峰 3d4f79ca59 asset:add assets_bulk_update 2016-10-28 21:19:37 +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
ibuler 92251f2a45 Merge with master 2016-10-28 15:09:38 +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
ibuler 374dfbdac2 Force merge 2016-10-28 11:36:37 +08:00
ibuler 534321d1aa Merge with master 2016-10-28 11:34:07 +08:00
ibuler 69c6f81c31 Add fake to 2016-10-28 00:21:11 +08:00
ibuler 9e3d740b43 Add fake to 2016-10-28 00:17:10 +08:00
ibuler 5cdc80ec11 Add init data 2016-10-27 23:59:54 +08:00
ibuler 217586b536 Add fake 2016-10-27 23:55:19 +08:00
ibuler 2abec15691 Rm ws4redis 2016-10-27 23:50:44 +08:00
ibuler 688bfa556c Merge with audits 2016-10-27 23:04:02 +08:00
ibuler 589d0d0fac Finish command log list 2016-10-27 22:58:19 +08:00
ibuler 3c00c578c3 Update some vie 2016-10-27 19:35:02 +08:00
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类 2016-10-27 15:20:16 +08:00
ibuler c0de35a683 Add layer and layer open command log 2016-10-27 00:52:44 +08:00
ibuler d19b47a427 add command log modal 2016-10-27 00:03:05 +08:00
ibuler 573b3a8743 Update log_command modal 2016-10-26 19:31:54 +08:00
ibuler 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +08:00
ibuler c2aab50c7b Add proxy log list 2016-10-25 23:23:01 +08:00
Administrator 13f34a8bdd ops: [future]完成ansible2.0 API 的基本封装. 2016-10-25 18:15:02 +08:00
江世峰 f88c149076 asset:add assets_bulk 2016-10-25 02:16:20 +08:00
ibuler 6a510dad6c Update some bug 2016-10-24 19:32:53 +08:00
江世峰 cdb1602e06 asset:add assets_bulk 2016-10-22 20:21:36 +08:00
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
Merge
2016-10-21 21:15:04 +08:00
江世峰 73f0199dc0 asset:add assets_bulk 2016-10-21 21:14:49 +08:00
ibuler 6b161d5971 Update import 2016-10-20 19:01:57 +08:00
ibuler 67ecc108bd Command parser 2016-10-20 00:26:53 +08:00
ibuler df380c343e Update api 2016-10-19 19:30:55 +08:00
ibuler 6164896793 Update some thing 2016-10-19 18:33:14 +08:00
ibuler 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +08:00
ibuler bb9a067293 Finish command log 2016-10-19 01:05:28 +08:00
ibuler 961abad14b Add heatbeat 2016-10-18 23:49:04 +08:00
ibuler 17ade287ab Add proxy log api 2016-10-18 19:28:36 +08:00
ibuler 7513474366 Finish terminal app 2016-10-17 17:28:07 +08:00