Commit Graph

518 Commits (56e648e924472e7f719525905f41850e6d68fe47)

Author SHA1 Message Date
ibuler 6015f2423b [Fixture] 添加PlaybookRunner
8 years ago
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory
8 years ago
ibuler ab62bfca7e [Bugfix] 修改一些bug
8 years ago
ibuler 9c2c38c74a [Bugfix] 修复导入自定义过滤器问题
8 years ago
ibuler 695dc96ce8 Merge branch 'audits'
8 years ago
ibuler 9518672ad2 Add
8 years ago
ibuler b055144908 Merge with audits
8 years ago
ibuler 7825c107ab [Bugfix] model FieldError
8 years ago
右书僮 dd5dd9d7e1 fixed html files
8 years ago
Webb 63fd3cfff2 fixed asset_group delete html
8 years ago
Webb a6825ac91e fixed asset_list html and asset_update
8 years ago
Webb 8ee9d02ffc fixed html
8 years ago
ibuler 008be6a8e3 [Fixtrue] 完成terminal detail 和批量结束会话
8 years ago
ibuler 1f544b98ab [Stash] 删除结束会话之前
8 years ago
ibuler 42e4c64d06 [Bugfix] 修复一些bug
8 years ago
xiaokong1937@gmail.com 548d7ef99a fix #13;fix `user` context conflict problem in user-detail page
8 years ago
ibuler 9c7bd7d285 [Fixture] 添加record log
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
xiaokong1937@gmail.com fe01f92545 user profile: update ssh pk
8 years ago
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags
8 years ago
xiaokong1937@gmail.com f3647ea46d user-profile page
8 years ago
xiaokong1937@gmail.com 31bded8953 CAPTCHA_TEST_MODE settings and small fix
8 years ago
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug
8 years ago
ibuler df94d11f53 [Fix] 修改一些api bug
8 years ago
ibuler ffed28c9c7 [Change] 修改perm的代码, 强制79个字符内
8 years ago
ibuler 25cb47d2f5 [Change] 拆分user view为多个view
8 years ago
ibuler 87bbb6afde [Bugfix] 修改添加系统用户view
8 years ago
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误
8 years ago
ibuler 8658675f67 [Bugfix] 重命名applications导致api请求content_type不对
8 years ago
ibuler be3f94d86c [BugFix] 修改requirements添加新的库
8 years ago
ibuler 17657deb0e [Bugfix] 和Master分支合并后,修复冲突,DRF 新版本要求 fields和exclude
8 years ago
ibuler 49861b6a84 Merge with master
8 years ago
ibuler 3da33a57e2 [Bugfix] 修改tab -> space, 删除system user的 as default
8 years ago
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile
8 years ago
右书僮 dbdb8a58fe 资产相关API及Web
8 years ago
ibuler b670259ab6 Modify terminal reqject templatte
8 years ago
ibuler 0907f5021e Finish form ajax submmit
8 years ago
ibuler 301e02bcd8 Update some api
8 years ago
ibuler 70da177ed7 Update api
8 years ago
ibuler 92d854b971 Update api
8 years ago
ibuler d80fec6e60 Update some api
8 years ago
ibuler d56f030dc4 Finish terminal accept
8 years ago
ibuler 775cd523eb Update app terminal name to applications
8 years ago
ibuler a8fa4d2f0c update terminal regist
8 years ago
ibuler 2707012325 Finish access key auth
8 years ago
ibuler c5ab49c515 Finish access key auth
8 years ago
ibuler fe17bec752 Add access key auth
8 years ago
ibuler 5b4ce709af Add private token and change user group
8 years ago
ibuler 875aaa0029 update user model for create application user
8 years ago
ibuler 589b6d7cfe update
8 years ago
ibuler 649509dec1 Change models dir
8 years ago
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