Commit Graph

322 Commits (77f2bd92620025cf8d3562aeb41018ae2deaab84)

Author SHA1 Message Date
ibuler 521a5c57a2 [Update] 统一copyright
7 years ago
q4speed 05255f850f Merge remote-tracking branch 'origin/dev' into dev
7 years ago
q4speed c96a107e0a 对齐菜单文字。修改英文
7 years ago
ibuler e2cb128794 [Update] 修改翻译
7 years ago
ibuler f1c386714d [Update]一些修改
7 years ago
ibuler 08edda35e1 [Update] 完成资产书
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler 17f91f7f53 [Update] 修改位置
7 years ago
ibuler 7433327d75 [Feature] 标签管理功能
7 years ago
ibuler f37b331630 Merge with dev
7 years ago
ibuler 9dbf498322 [Update] 修改copyright
7 years ago
ibuler 8e6efac6db [Update] 修改copyrite
7 years ago
ibuler 579e74dd5d [Bugfix] 修复一些bug
7 years ago
ibuler 2f136800c7 [Update] 修改默认头像和logo
7 years ago
ibuler 5bbad01909 [Feature] 增加标签
7 years ago
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug
7 years ago
ibuler d48f8dceb5 [Update] 修改翻译
7 years ago
ibuler abb1a40a4f [Feature] 添加basic settings
7 years ago
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav
7 years ago
ibuler 6aaa106aff [Bugfix] 修复以下bug
7 years ago
ibuler 450a9495ec [Bug&Update] 以下bug和功能
7 years ago
ibuler 07a70311df [Bugfix] 修复以下bug
7 years ago
ibuler 1888c698f1 [Bugfix] 修复一些bug
7 years ago
ibuler afce4c81a8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
7 years ago
ibuler 28223421b1 [Bugfix] 修复一下bug
7 years ago
q4speed 9a2fbba956 修改访问官网链接
7 years ago
ibuler a327c46229 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 720dc9ab05 [Bugfix] 修复以下bug
7 years ago
q4speed 25fa392dda 修复图片高度和大小
7 years ago
q4speed ad3297ff2f 显示个人头像
7 years ago
q4speed ab27d1c193 修改菜单折叠起来时Logo
7 years ago
q4speed 8160425672 修改Logo
7 years ago
ibuler 68ccec6b9c [UPdate] 修改cookie设置
7 years ago
ibuler 3b6403b2f2 [Update] 修改一些翻译
7 years ago
ibuler c48531c586 [Update] 添加和修改部分翻译
7 years ago
ibuler 0916757eb8 [Bugfix] 修复一些bug
7 years ago
ibuler e0a3fafbd5 [Bugfix] 详见trello
7 years ago
ibuler e20444983d [Bugfix] 修改html bug
7 years ago
ibuler 825edadc13 [Update] Add build no
7 years ago
ibuler bf9bb1b973 [Update] 修改ops task运行
7 years ago
ibuler 76df1de634 [Bugfix] 修复一些明显的bug
7 years ago
ibuler 6cee62696c [Feature] 翻译,并增加设置导航
7 years ago
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
7 years ago
ibuler 17ddb3bbbd [Feture] 使用信号解耦
7 years ago
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码
7 years ago
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系
7 years ago
ibuler 0c9e24dc59 [Feture] 添加ops 页面
7 years ago
ibuler 27a1849b1d [Change] 修改idc => cluster
7 years ago
ibuler e57121a780 [Feature] 优化Ops ansible api
7 years ago
ibuler ec8106e43d [Feature] 完成登陆日志
7 years ago
ibuler a5f9735906 [Update] 更新index view
7 years ago
ibuler 71a3079221 [Feature] 离线session完成
7 years ago
ibuler bf8fa95597 [Update] 修改session
7 years ago
ibuler 1920a0f03d [Bugfix] 修改nav小bug
7 years ago
ibuler 3120cef335 [Change] 修改导航列表
7 years ago
ibuler 61a8d95f46 [Change] Rename applications -> terminal
7 years ago
ibuler 26607bc327 [Copyright] 修改copyrite
7 years ago
ibuler 688a836bbe [Copywriting] Copywriting change fixes #733
7 years ago
njqaaa dd6c82b168 fix left's users logout (#446)
8 years ago
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug
8 years ago
ibuler 071d1922d0 stash it
8 years ago
ibuler 5418d0b44c [Change] Using csv replace xlsx
8 years ago
ibuler b913bce398 [Bugfix] 修改翻译bug
8 years ago
ibuler c11374ae39 [Bugfix] 修改翻译
8 years ago
ibuler 97fb2a4fe6 [Fixture] 修改index页面
8 years ago
ibuler 709552f14c [Fixture] 添加首页
8 years ago
ibuler 7720e9f3fd [Change] 修改图片
8 years ago
ibuler 61a481f427 [Fixture] 添加用户连接终端
8 years ago
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改
8 years ago
ibuler 0983f294b7 [Fixture] 添加用户profile
8 years ago
ibuler 4e7b665ea8 [Change] 添加翻译,并添加用户登陆页面
8 years ago
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度
8 years ago
ibuler 10eb13920b [Delete] 删除资产tag
8 years ago
ibuler a57dac0706 [Fixture] 拆分proxy log 为在线和离线
8 years ago
ibuler b60e5a7ee3 [Change] 修改一些view
8 years ago
ibuler caec9709ef [Fixture] 添加task list 搜索,重试
8 years ago
ibuler 240c7db416 [Fixture] 添加 rerun function
8 years ago
ibuler 915873135e [Fixture] 添加runner run record
8 years ago
ibuler ab62bfca7e [Bugfix] 修改一些bug
8 years ago
ibuler b055144908 Merge with audits
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
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug
8 years ago
ibuler d56f030dc4 Finish terminal accept
8 years ago
ibuler 775cd523eb Update app terminal name to applications
8 years ago
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现
8 years ago
Administrator 8e0afb2cc4 调整模型
8 years ago
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题
8 years ago
Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev
8 years ago
Administrator 18e0fee1a7 [future] 添加作业中心基础框架
8 years ago
ibuler 8d358a7a68 UPdate some
8 years ago
ibuler 10aa8c40a7 Add login log
8 years ago
ibuler 8d7759d22f change user api
8 years ago
ibuler 968b1b4cb6 Stash
8 years ago
ibuler 41337d28c3 add proxy log search
8 years ago
ibuler 374dfbdac2 Force merge
8 years ago
ibuler 534321d1aa Merge with master
8 years ago
ibuler 688bfa556c Merge with audits
8 years ago
ibuler 589d0d0fac Finish command log list
8 years ago
ibuler c2aab50c7b Add proxy log list
8 years ago
ibuler 45dcb26123 Merge branch 'audits'
8 years ago
ibuler 303659cb0e Change app name apps => terrminal
8 years ago
ibuler 4531157c72 may be some wrong
8 years ago
江世峰 abe09e2a85 asset:update assets_list by tag
8 years ago
江世峰 73f5891f87 asset:update assets_list by tag
8 years ago
江世峰 b99b88a30f asset:update tag
8 years ago
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15
8 years ago
江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 fd52a85dbb fix #25
8 years ago
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op
8 years ago
xiaokong1937@gmail.com 70a6ddc897 fix #27
8 years ago
xiaoyu 15dcc760b4 user list bulk update modal
8 years ago
xiaoyu d2197d99c2 fix #26
8 years ago
xiaoyu af713672fb user list page bulk action
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
江世峰 6c7e51041f update assets_group
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
xiaoyu 8a5a4f3362 fix #14
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler 766bd3b76d Move js to jumpserver.js
8 years ago
ibuler bb8852d57e Modify some style
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 1005fbabbd add assets manage
8 years ago
unknown 8490583d73 add assets manage
8 years ago
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler 324bb68667 user-pserm
8 years ago
ibuler 4fc9274e00 Add asset system user
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com 7f09b486d9 user-group edit serializer and url implement
8 years ago
ibuler 30fd51c268 Asset group detail
8 years ago
xiaokong1937@gmail.com 556fb4e09f refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes
8 years ago
xiaoyu c6f875c517 temp commit
8 years ago
ibuler 07dd6d1192 Reslove conflict
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
xiaoyu 8cc09f0e5a move login and logout view back to CBV
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler 3c6f50b788 Modify some bug
8 years ago
ibuler 2cb6b15bc3 set textarea rows
8 years ago
xiaokong1937@gmail.com 397da7d676 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com e75d33439a fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
8 years ago
ibuler 7241f7509f Update nav
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
ibuler acd98365c1 Fix translation
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
ibuler 0b406b6988 Add captch login using
8 years ago
ibuler 8ff872f41d Add ls config
8 years ago
ibuler 5940cec0e6 Add user and send mail
8 years ago
ibuler c9369db578 Add new login page
8 years ago
ibuler 3c9dbaf860 Fix some bug
8 years ago
ibuler d95ffdfbf7 Test permmision
8 years ago
ibuler bb76f6c652 Add api authentication
8 years ago
ibuler 641e998504 Update context name path1, path2 => app, action
8 years ago
ibuler 1d5faa3101 Delete Model: Role
8 years ago
ibuler c37dea2079 Add user add view Test Case
8 years ago
ibuler b55b516fc3 Update foot_js.html add active
8 years ago
ibuler 1f3c0d004f Change update batch, add _list_base.html
8 years ago
ibuler ae9bbb40fd Add flash message template
8 years ago
ibuler e355c7b8ef Modify pagination and Role model
8 years ago
ibuler cf15b7eaff Add UserGroup some View
8 years ago
ibuler 279987925a Modify user detail of usergroup
8 years ago
ibuler 7a8d4a3a59 Add delete view
8 years ago
ibuler 3bf0d4aabb Add common app
8 years ago
ibuler 9493fb07cb Add user list view
8 years ago
ibuler 234684c875 Rename dir name dashboard to apps
8 years ago