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

4901 Commits (093e3924a2975169a00fcb24ba2e3099bb856917)

Author SHA1 Message Date
老广 c5438fd65d
Merge pull request #3445 from jumpserver/dev 
Dev
 2019-11-20 10:26:34 +08:00
ibuler 66b8e59ae7 [Update] 修改nav 2019-11-19 15:49:41 +08:00
ibuler e424315d93 [Update] 修改用户列表serializer 2019-11-19 15:25:28 +08:00
ibuler 4c801bb828 [Update] 修改用户列表 2019-11-19 15:23:19 +08:00
ibuler 1bba00412a [Update] 修改user list 页面字段宽度 2019-11-19 11:25:36 +08:00
ibuler bf40aa8df0 [Update] 修改user list api 2019-11-19 11:20:26 +08:00
ibuler 0c349f9350 [Update] 更改翻译 2019-11-19 10:30:32 +08:00
ibuler 4dc5d7d70e [Update] 换做lazyproperty 2019-11-19 10:26:01 +08:00
ibuler 3fc30aa96c [Update] 修改tickets 2019-11-18 18:44:21 +08:00
ibuler bb1349e962 [Update] 修改MFA 2019-11-18 18:12:03 +08:00
ibuler c9ee8edeaf [Update] 修改mfa 2019-11-18 16:30:26 +08:00
ibuler bfd8a9c66d [Update] 修改asset permission搜索 2019-11-18 15:18:47 +08:00
ibuler 030551d987 [Update] 工单提交 2019-11-18 12:14:16 +08:00
ibuler 2f4096bf3d [Update] 修改ticket 2019-11-18 11:54:12 +08:00
ibuler ebe129b3c2 [Update] 修改工单 2019-11-15 18:55:35 +08:00
BaiJiangJie 61a8d6a5ca
Merge pull request #3440 from jumpserver/dev_au 
[Update] 资产用户列表支持模糊搜索
 2019-11-15 15:03:27 +08:00
BaiJiangJie c6e7872ba8 [Update] 资产用户列表支持模糊搜索 2019-11-15 14:58:43 +08:00
BaiJiangJie 096d4a4221
Merge pull request #3438 from jumpserver/dev_terminal 
[Update] 修改终端注册条件判断逻辑（从 serializer -> view）
 2019-11-15 12:20:08 +08:00
BaiJiangJie 9b5cb8b0c5 [Update] 限制通过 POST 方法调用 TerminalViewSet API 2019-11-15 12:11:58 +08:00
BaiJiangJie bea5dadbac [Update] 修改终端注册条件判断逻辑（从 serializer -> view） 2019-11-15 11:56:51 +08:00
ibuler 18f8864720 [Update] public config 添加超时时间 2019-11-14 19:35:44 +08:00
ibuler f71290d645 [Update] 左侧组织dropdown增加过滤 2019-11-14 15:38:22 +08:00
ibuler e69d283af9 [Update] 增加过滤 2019-11-14 15:37:39 +08:00
ibuler 31f5b2c06c Merge remote-tracking branch 'origin/1.5.5' into 1.5.5 2019-11-14 14:54:20 +08:00
ibuler 611d5fc1fa [Update] Message可以关闭 2019-11-14 14:53:57 +08:00
ibuler 8dba54e7c5 [Update] 优化table页数 2019-11-14 12:12:34 +08:00
ibuler 2ef487a92f [Update] 修改收集用户 2019-11-14 11:46:42 +08:00
BaiJiangJie aebf32d7be [Update] 删除 py-radius 依赖 2019-11-14 10:56:29 +08:00
BaiJiangJie 870e04feac [Update] 添加 py-radius 依赖 2019-11-13 18:46:22 +08:00
BaiJiangJie 4b2fbbfb84 [Update] 添加 MFA Radius py-radius 测试类 2019-11-13 18:44:59 +08:00
老广 0946645783
Merge pull request #3433 from jumpserver/dev 
Dev
 2019-11-13 17:04:01 +08:00
BaiJiangJie f3d2e5d1b3
Merge pull request #3434 from jumpserver/dev_ldap 
[Update] 修改设置 LDAP 同步任务在任务外部设置running状态
 2019-11-13 16:46:46 +08:00
BaiJiangJie 6bfb026e47 [Update] 修改设置 LDAP 同步任务在任务外部设置running状态 2019-11-13 16:45:38 +08:00
ibuler aa428b0299 [Update] 修改测试网关提示，不能包含特殊字符 2019-11-13 16:40:34 +08:00
BaiJiangJie 0a74602df3 [Update] 修改设置 LDAP 同步任务在任务外部设置running状态 2019-11-13 15:08:54 +08:00
ibuler 05e7311b0b Merge branch 'dev' into 1.5.5 2019-11-13 14:56:02 +08:00
ibuler f40d51c84f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-11-13 14:55:29 +08:00
ibuler 46a2311e30 [Update] 暂时关闭celery处理请求数量 2019-11-13 11:25:33 +08:00
BaiJiangJie 76e59f5bcd
Merge pull request #3430 from jumpserver/dev_auth_info 
[Update] 修改 sytem-user-asset-auth-info API 的权限（只允许 App）访问
 2019-11-13 11:19:49 +08:00
BaiJiangJie e731c01cc4 [Update] 修改 sytem-user-asset-auth-info API 的权限（只允许 App）访问 2019-11-13 11:18:29 +08:00
BaiJiangJie 6067dbcf21
Merge pull request #3429 from jumpserver/dev_auth_info 
[Update] 修改获取系统用户-资产-认证信息API，添加 NeedMFAVerify 权限类
 2019-11-12 19:04:14 +08:00
BaiJiangJie 4057064b7f [Update] 修改获取系统用户-资产-认证信息API，添加 NeedMFAVerify 权限类 2019-11-12 19:00:53 +08:00
BaiJiangJie 3f1e75c6f9
Merge pull request #3428 from jumpserver/1.5.5_bai 
1.5.5 bai
 2019-11-12 14:14:46 +08:00
BaiJiangJie 5434b65773 [Update] Merge branch dev to 1.5.5 2019-11-12 14:11:34 +08:00
ibuler a01126c6c7 [Update] 修改radius MFA 2019-11-11 20:10:49 +08:00
BaiJiangJie 200ca65dc5
Merge pull request #3426 from jumpserver/dev_ldap2 
Dev ldap2
 2019-11-11 19:00:00 +08:00
BaiJiangJie 78a7bfbd30 [Update] 修复取消 LDAP 同步用户任务失败的问题 2019-11-11 18:50:05 +08:00
BaiJiangJie fc58906bce [Update] 修改翻译信息 2019-11-11 18:15:25 +08:00
BaiJiangJie e0d7a0e239 [Update] 重构 LDAP/AD 同步功能，添加缓存机制 4 2019-11-11 18:10:21 +08:00
BaiJiangJie 82077f4a0e [Update] 重构 LDAP/AD 同步功能，添加缓存机制 3 2019-11-11 18:05:32 +08:00