github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,500 Commits
72 Branches
250 Tags
118 MiB
Commit Graph

4500 Commits (bf0575b74d67ce5f0cff16418d5492ee27b6a245)

Author SHA1 Message Date
BaiJiangJie bf0575b74d
Merge pull request #3404 from jumpserver/dev 
Dev
 2019-11-01 15:13:45 +08:00
BaiJiangJie 3dfb2d6af2
Merge pull request #3405 from jumpserver/bugfix 
[Update] 修改 AuthBook set_version / set_latest
 2019-11-01 15:07:31 +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
BaiJiangJie 4f7ab69508 [Bugfix] 修复执行任务，没有保存 history 的问题 2019-10-31 18:05:52 +08:00
老广 2afeba8b5f
Merge pull request #3400 from jumpserver/dev 
Dev
 2019-10-30 13:24:15 +08:00
ibuler 87247da0ec [Bugfix] 修复获取数量是报错 2019-10-30 13:23:06 +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
BaiJiangJie bf92b61b78
Merge pull request #3389 from jumpserver/dev 
Dev
 2019-10-25 18:08:00 +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 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 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
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
BaiJiangJie 69bcf3de2e
Merge pull request #3381 from jumpserver/dev 
Dev
 2019-10-24 12:43:05 +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
BaiJiangJie 58f564b028
Merge pull request #3379 from jumpserver/dev 
Dev
 2019-10-24 12:22:25 +08:00
BaiJiangJie 8fd65a372e
Merge pull request #3378 from jumpserver/dev_req 
[Update] 更新依赖包版本
 2019-10-24 12:10:49 +08:00
BaiJiangJie f8f1aee997 [Update] 更新依赖包版本 2019-10-24 12:08:48 +08:00
BaiJiangJie 7c4dee324f
Merge pull request #3377 from jumpserver/dev 
Dev
 2019-10-23 15:25:04 +08:00
BaiJiangJie 4c1821e42e
Merge pull request #3376 from jumpserver/dev_v 
[Update] 修改版本号（1.5.4）
 2019-10-23 15:23:57 +08:00
BaiJiangJie f31ed0afb8 [Update] 修改版本号（1.5.4） 2019-10-23 15:20:56 +08:00
BaiJiangJie 5e5f3ad383
Merge pull request #3375 from jumpserver/dev 
[Update] Add debug message
 2019-10-23 15:18:35 +08:00
ibuler f802fb645d [Update] Add debug message 2019-10-23 11:01:39 +08:00
老广 93e8c9e534
Merge pull request #3374 from jumpserver/dev 
Dev
 2019-10-23 10:17:45 +08:00
老广 0b405fdefa
Merge pull request #3373 from jumpserver/bugfix 
Bugfix
 2019-10-23 10:17:09 +08:00
ibuler c995050ed7 [Update] 修改ws read celery log file 2019-10-23 10:14:07 +08:00
ibuler 0dbf2ab2e5 [Update] 修改websocket读取日志 2019-10-22 19:45:03 +08:00
老广 22cc8ffbdd
Merge pull request #3370 from jumpserver/bugfix 
Bugfix
 2019-10-22 19:33:01 +08:00
ibuler 6b8b0f4a0b [Update] 修改terminal字体 2019-10-22 19:30:53 +08:00
ibuler b3502a9291 [Update] 修改terminal字体 2019-10-22 19:30:39 +08:00
BaiJiangJie 1c92516fd0
Merge pull request #3369 from jumpserver/dev 
Dev
 2019-10-22 19:11:55 +08:00
BaiJiangJie c3f02dbaab
Merge pull request #3368 from jumpserver/dev_icon 
[Update] 修改icon图片
 2019-10-22 19:11:11 +08:00