github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,510 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

4510 Commits (08775551c21633fdc5dff96dc1fa43f8de1dc1ae)

Author SHA1 Message Date
ibuler 08775551c2 [Update] Rename app 2019-11-07 18:06:58 +08:00
ibuler edce831e46 [Update] 修改api 2019-11-06 16:59:54 +08:00
ibuler 12e1e559b5 [Update] 修改bug 2019-11-06 14:40:41 +08:00
ibuler fa02e3fb75 [Update] Merge with bugfix 2019-11-06 14:38:06 +08:00
ibuler ed5a57042a [Update] windows跳过手动输入密码 2019-11-06 14:28:49 +08:00
ibuler 6fbc4ce4fb [Update] MFA 2019-11-06 12:06:30 +08:00
ibuler eedaaddbf5 [Update] 用户创建支持修改source 2019-11-06 11:57:00 +08:00
ibuler bae4387068 [Update] tree出现滚动条 2019-11-05 19:44:34 +08:00
ibuler 8de863525a [Update] 修改消息 2019-11-05 19:05:29 +08:00
ibuler 6ce9815d51 [Update] 基本完成登录逻辑 2019-11-05 18:46:29 +08:00
ibuler 9d201bbf98 [Update] 修改 token api 2019-11-01 20:34:56 +08:00
ibuler c25335cf95 [Update] 修改authbook 2019-11-01 14:52:37 +08:00
ibuler ebbe49fab2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-11-01 14:10:12 +08:00
ibuler 28ad362b8d [Update] 修改设置最新版本 2019-11-01 14:09:44 +08:00
BaiJiangJie b595ac9bc5
Merge pull request #3403 from jumpserver/dev_ops 
[Bugfix] 修复执行任务，没有保存 history 的问题
 2019-10-31 18:45:30 +08:00
ibuler 11f0024c33 [Update] 添加登录复核开关 2019-10-31 18:43:47 +08:00
ibuler dc3a9561c2 [Update] 基本完成登陆审核 2019-10-31 18:23:43 +08:00
BaiJiangJie 4f7ab69508 [Bugfix] 修复执行任务，没有保存 history 的问题 2019-10-31 18:05:52 +08:00
ibuler 23b777b23b Merge branch 'dev' into 1.5.5 2019-10-31 11:09:59 +08:00
ibuler fe235823b4 [Update] 修改工单 2019-10-30 19:30:49 +08:00
ibuler 87247da0ec [Bugfix] 修复获取数量是报错 2019-10-30 13:23:06 +08:00
ibuler d0ba67ed50 [Update] 基本完成登录二次审核 2019-10-30 13:18:11 +08:00
BaiJiangJie c163427db2
Merge pull request #3397 from jumpserver/dev_bai 
Dev bai
 2019-10-29 18:00:42 +08:00
BaiJiangJie c7ecfd7943 [Bugfix] 修复当终端设置包含多个命令存储时，访问 /docs/ 页面错误的问题 2019-10-29 17:58:58 +08:00
BaiJiangJie db5ff0f922 [Update] 修改用户 LDAP/AD Source 时排除 admin 用户 2019-10-29 16:37:25 +08:00
BaiJiangJie c29381e657
Merge pull request #3395 from jumpserver/dev_loginlog 
[Update] 登录日志导出按照组织进行过滤
 2019-10-29 12:30:56 +08:00
BaiJiangjie ff62968bf6 [Update] 登录日志导出按照组织进行过滤 2019-10-29 12:29:15 +08:00
BaiJiangJie 4e1e60046a
Merge pull request #3392 from jumpserver/api_key_table 
[Update] 修改api_key_table显示不友好问题
 2019-10-28 17:24:16 +08:00
jym503558564 82c4705350 [Update] 修改api_key_table显示不友好问题 2019-10-28 17:21:28 +08:00
ibuler 517c682201 [Update] 修改登录路基 2019-10-25 19:20:28 +08:00
BaiJiangJie f6d2ac9b7b
Merge pull request #3388 from jumpserver/dev_bai 
[Update] 优化 config_example.py 中 AUTH_LDAP 配置项
 2019-10-25 17:48:12 +08:00
BaiJiangJie 98a8ef1526 [Update] 优化 config_example.py 中 AUTH_LDAP 配置项 2019-10-25 17:46:26 +08:00
BaiJiangJie 4167987d67
Merge pull request #3387 from jumpserver/dev_ldap 
[Update] LDAP 认证添加配置项 OPT_REFERRALS（解决问题: In order to perform this op…
 2019-10-25 17:29:54 +08:00
BaiJiangJie ef41ba3117 [Update] LDAP 认证添加配置项 OPT_REFERRALS（解决问题: In order to perform this operation a successful bind must be completed on the connection) 2019-10-25 17:09:22 +08:00
ibuler 458bee9a19 Merge branch 'dev' into 1.5.5 2019-10-25 15:33:02 +08:00
ibuler d22f60364a [Update] 修改js 2019-10-25 12:52:21 +08:00
ibuler 90321ab68c [Update] 修改js 2019-10-25 12:50:48 +08:00
ibuler a5814c8100 [Update] 修改js 2019-10-25 12:49:22 +08:00
ibuler 87fd342b68 [Update] 修改model 2019-10-25 12:35:38 +08:00
ibuler d544f7f936 Merge branch 'dev' into 1.5.5 2019-10-25 12:13:14 +08:00
ibuler fbe4f4c119 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-10-25 12:10:46 +08:00
ibuler 4d53b6f078 [Update] 去掉debug信息 2019-10-25 12:09:27 +08:00
ibuler d2c65dd783 [Update] 修改table过滤 2019-10-25 12:08:49 +08:00
ibuler 0c1463bc8b [Update] 修改支持工单 2019-10-25 11:27:50 +08:00
BaiJiangJie 39b4145868
Merge pull request #3385 from jumpserver/dev_char 
[Update] 修改主机名/系统用户名称/组织名称的特殊字符限制（修改为特殊字符黑名单）[/ \]
 2019-10-25 11:17:45 +08:00
BaiJiangJie a57df0e05f [Update] 修改主机名/系统用户名称/组织名称的特殊字符限制（修改为特殊字符黑名单）[/ \] 2019-10-25 10:55:28 +08:00
BaiJiangJie 36d98a237f
[Update] 资产授权 Action 添加 Help text (#3383) 
* [Update] 资产授权 Action 添加 Help text

* [Update] 资产授权 Action 添加 Help text（修改翻译）
 2019-10-24 18:35:03 +08:00
ibuler cf719f492d [Update] 修改user group relations api 2019-10-24 14:36:01 +08:00
BaiJiangJie d3cf2afb51
Merge pull request #3380 from jumpserver/dev_req 
[Update] 更新依赖版本号
 2019-10-24 12:27:04 +08:00
BaiJiangJie 3c5ebeeb20 [Update] 更新依赖版本号 2019-10-24 12:23:39 +08:00