Commit Graph

417 Commits (4d96978b4f52561dc552ff90a3a6814c0018c859)

Author SHA1 Message Date
ibuler 4d96978b4f Merge branch 'master' into audits
8 years ago
ibuler 81ec121918 Merge branch 'master' of code.jumpserver.org:jumpserver/jumpserver
8 years ago
ibuler a448fd02e2 merged
8 years ago
ibuler 96d32f2e3e prepare merge ops
8 years ago
ibuler 4d71c2d1ff 修改token获取,拆分认证文件和权限文件
8 years ago
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev
8 years ago
yumaojun03 47d87e38a6 补充task需要的一些接口
8 years ago
ibuler 2ab8e92bf4 Add black line
8 years ago
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现
8 years ago
yumaojun03 86c5f0d3d3 完成cron和sudo的list和detail基础,ansible Task接口更上层抽象中
8 years ago
ibuler d964221689 Update api
8 years ago
wangjun5 87eed2e59b add asset tool
8 years ago
yumaojun03 b348f7f1ce 添加了部分cron的list页面
8 years ago
yumaojun03 a0c9e3d117 添加了部分sudo的页面
8 years ago
yumaojun03 3eb8a702c8 为模型生成fake数据
8 years ago
yumaojun03 806d38bbb2 模拟数据测试
8 years ago
yumaojun03 84613e51d8 为了防止循环导入,采用__all__导出模块变量
8 years ago
ibuler 69767e978d Add fake
8 years ago
yumaojun03 baba65ad43 修改url模块, 匹配整体架构风格.
8 years ago
yumaojun03 d0460d8691 修改url模块, 匹配整体架构风格.
8 years ago
ibuler a7476222a9 Update import
8 years ago
Administrator 61ac9129b0 url少加了下划线
8 years ago
ibuler 3aea994101 asset import
8 years ago
Administrator 8e0afb2cc4 调整模型
8 years ago
ibuler c1c9c7b68a update asset
8 years ago
ibuler 6e843533cb Base finish user
8 years ago
ibuler d8a229c09b to Commpany
8 years ago
Administrator 2494fa5846 修改url
8 years ago
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题
8 years ago
ibuler 72ad4b44ce update bug
8 years ago
Administrator 1bc88e5b11 Merge branch 'ansible_api' into ops_dev
8 years ago
Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev
8 years ago
Administrator 7c4aefd959 兼容py3测试
8 years ago
ibuler c1a74aebc5 [BugFix] update some user import bug
8 years ago
ibuler eae580e51f Update user import and export
8 years ago
ibuler e28f7a3bec Add export and import
8 years ago
ibuler be99eb82e8 udpate some bug
8 years ago
ibuler 5af97c969b export csv
8 years ago
ibuler 7dfde3a3c5 Update
8 years ago
Administrator cd22c39078 [future] 将Task移到一个包内管理
8 years ago
Administrator 32a5aec34e [future] 调整app架构
8 years ago
Administrator fea76178ee 添加作业中心i18n
8 years ago
Administrator 3abe2196dd [future] 添加作业中心 i18n相关
8 years ago
Administrator 18e0fee1a7 [future] 添加作业中心基础框架
8 years ago
Administrator 954814da65 [future] 添加Cron相关的基础API框架
8 years ago
ibuler 180af7e0bd Update csv
8 years ago
Administrator 79971d677d [future] 使用mixin去掉重复多余代码
8 years ago
Administrator 1e835d2fa9 [future] 增加503和501的自定义异常
8 years ago
Administrator 76f72dfb58 [future] 添加路由, 增加api认证, 测试所有添加的api
8 years ago
Administrator 5ae2711c6e sudo privilege删除走api
8 years ago