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

2599 Commits (b33173042219526feffba7c153cd104d7c4004c5)

Author SHA1 Message Date
ibuler 213fdd461b fix: 修改翻译 2020-06-11 14:33:42 +08:00
ibuler 148c7ffb43 fix: 添加注释 2020-06-11 14:10:55 +08:00
ibuler 75be45ce43 feat: 使用新的对称加密方式: aes 2020-06-11 12:10:00 +08:00
ibuler 04eb670ada Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-11 11:29:28 +08:00
ibuler 66f3706142 feat: 添加aes fix: 修改时区的bug 2020-06-11 11:28:37 +08:00
xinwen 9ea98bf2b2
[Feature] 添加 会话管理/历史会话/下载 api (#4093) 2020-06-10 17:34:56 +08:00
ibuler 4695f80172 faet: 修改翻译 2020-06-10 17:17:16 +08:00
ibuler 0452d53c3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-10 16:00:24 +08:00
ibuler ec30ef1f8b feat: readme添加版本说明 2020-06-10 15:57:41 +08:00
Eric_Lee 1c0ad08d80
fix ldap test i18n msg (#4092) 2020-06-10 15:10:43 +08:00
ibuler e1ab453780 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-10 12:58:43 +08:00
ibuler 1a6597b572 feat: 修改command filter数据结构 2020-06-10 12:58:18 +08:00
xinwen 865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090) 2020-06-09 20:26:23 +08:00
ibuler 4d4a107101 feat: 修改oid获取顺序，添加从cookie中获取 2020-06-09 16:43:07 +08:00
ibuler 82f70cb0dc feat: ticket添加翻译 2020-06-09 16:10:31 +08:00
ibuler 820186c6d0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-09 15:16:01 +08:00
ibuler 4468e2d379 feat: 限制gateway 仅有ssh协议 2020-06-09 15:08:15 +08:00
Eric_Lee bd802e6a50
add logo urls (#4088) 2020-06-09 14:06:11 +08:00
ibuler 9362c272cb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-09 10:19:07 +08:00
ibuler ee4534ac4b feat: public setting添加key 2020-06-09 10:17:16 +08:00
xinwen 7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings (#4086) 2020-06-08 17:16:30 +08:00
ibuler 31daaed4cd feat: 添加auth confirm 到public setting 2020-06-08 16:48:10 +08:00
ibuler 71202e83f5 feat: 修改用户的api 2020-06-05 20:15:23 +08:00
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用 2020-06-05 14:43:40 +08:00
ibuler 076b7babcb 修改批量命令的api 2020-06-05 14:20:34 +08:00
ibuler 8569910658 feat: command exexution audit log的搜索 2020-06-05 14:07:23 +08:00
xinwen 34c556d375
[Fix] spm (#4082) 2020-06-05 10:42:03 +08:00
ibuler a43d6ad34d feat: 资产添加admin_user_display 2020-06-04 20:26:42 +08:00
ibuler ca6825008b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-04 20:00:48 +08:00
ibuler 9c6f118dbd feat: 添加批量命令的relation 2020-06-04 20:00:39 +08:00
Bai 5730e60089 [Update] 修改用户profile序列类 2020-06-04 17:24:31 +08:00
Bai afc7f3bb9c [Update] 修改用户public_key生成密钥的view 2020-06-04 17:05:36 +08:00
Bai c411b0a38e Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-04 17:02:52 +08:00
Bai 403b6fc563 [Update] 修改用户更新Public_key的条件判断 2020-06-04 17:02:43 +08:00
xinwen 55ae8bb5e6
[Fix] 系统设置/邮件设置/测试链接失败 (#4081) 2020-06-04 16:47:43 +08:00
Eric_Lee dbcf785e42
add flower view (#4078) 2020-06-04 15:10:02 +08:00
ibuler e6cd126045 feat: 修改api的权限 2020-06-04 14:55:33 +08:00
Bai 420f3c0c4c [Update] 添加celery task log view 2020-06-04 14:30:44 +08:00
Bai 9b2c5cb305 [Update] 修改用户profile序列类3 2020-06-03 21:00:37 +08:00
Bai 907f0068db [Update] 修改用户profile序列类2 2020-06-03 20:21:28 +08:00
Bai a16b3260ba Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-03 18:20:43 +08:00
Bai 1845821f6c [Update] 修改用户profile序列类 2020-06-03 18:20:33 +08:00
ibuler 27d906a877 feat: 去掉js i18n catalog 2020-06-03 16:26:10 +08:00
xinwen 431ba36a26
[Fix] 会话管理/命令记录 时间过滤 bug (#4070) 2020-06-03 15:05:55 +08:00
Eric_Lee 229c782157
change PAGE_SIZE_CHOICE to string value (#4069) 2020-06-03 14:06:44 +08:00
ibuler 5bacab7475 fix: 重置密钥到auth中 2020-06-03 12:44:45 +08:00
ibuler 999286a089 fix: 修复用户公钥错误引起的profile bug 2020-06-03 12:32:52 +08:00
ibuler 68ccaf0cb3 feat: 去掉第一次登录的那个导航 2020-06-03 12:26:53 +08:00
ibuler 8d58d58519 feat: 修改profile view 2020-06-03 11:58:16 +08:00
ibuler 8efc0331de feat: 删掉所有view, templates, forms 2020-06-03 11:43:43 +08:00
ibuler 7c479c2479 feat: 修改docs的url 2020-06-03 11:17:00 +08:00
ibuler 96551856a2 [Update] 部分view放到auth中 2020-06-03 11:06:44 +08:00
ibuler b1f5cc7728 [Update] 禁用view 2020-06-03 10:38:44 +08:00
ibuler 1a84661ca9 feat: 修改filterset_fields => filter_fields，option方法不支持filterset 2020-06-02 20:02:22 +08:00
ibuler 50bea55732 merge: with dev 2020-06-02 15:43:42 +08:00
ibuler a4ece2b271 feat: audits中添加id字段 2020-06-02 15:41:27 +08:00
xinwen b460e4abaa
[Fix] 日志审计 日期过滤与排序bug (#4063) 2020-06-02 15:40:07 +08:00
BaiJiangJie 087ba9ae95
Merge pull request #4059 from jumpserver/lina 
Lina
 2020-06-01 14:05:22 +08:00
Bai 9850633350 [Update] 添加LDAP USER_QUERY_FIELD字段值为username，解决数据库因大小敏感导致LDAP用户认证首次成功，再次失败的问题；如果不配置此字段，则查询使用小写，创建可能会使用大写，最终导致username重复而创建用户失败； 2020-06-01 12:06:39 +08:00
ibuler 5f2345852d Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-06-01 11:41:55 +08:00
ibuler ad1c17aa7b feat: 仅支持fields_size=mini,small 2020-06-01 10:10:28 +08:00
xinwen 3a79bfd5f6
[Update] 添加一些 i18n (#4052) 2020-05-29 15:18:25 +08:00
Bai 5ee8519274 [Update] 修改AccessKey序列类 2020-05-29 14:04:50 +08:00
Bai ff546774e9 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 20:46:30 +08:00
Bai 1f4fc9b6f0 [Update] 修改API-Key序列类 2020-05-28 20:46:17 +08:00
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049) 2020-05-28 19:08:48 +08:00
Bai 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 17:47:27 +08:00
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类 2020-05-28 17:47:18 +08:00
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040) 
* [Feature] 权限管理-> 远程应用 添加 api

* [Feature] 添加 RelationMixin
 2020-05-28 17:00:42 +08:00
Bai 3e5d949610 [Update] 添加用户profile password序列类 2020-05-28 16:10:28 +08:00
Bai 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 15:03:07 +08:00
Bai f3bc6c0b22 [Update] 修改用户profile序列类 2020-05-28 15:02:53 +08:00
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数 2020-05-28 14:47:30 +08:00
ibuler a463f632e8 [Update] 优化重定向 2020-05-27 20:33:09 +08:00
ibuler a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 19:51:45 +08:00
Bai 7afff5e392 [Update] merge from dev to lina 2020-05-27 18:44:12 +08:00
ibuler 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 18:03:14 +08:00
ibuler a840e611cd [Update] 修改core 的base url 2020-05-27 18:02:18 +08:00
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-27 17:27:38 +08:00
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段 2020-05-27 17:27:28 +08:00
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-26 19:00:00 +08:00
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api 2020-05-26 18:56:03 +08:00
老广 71a72dd957
Merge pull request #4033 from jumpserver/update-i18n 
[Update] i18n
 2020-05-25 01:53:02 -05:00
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段 2020-05-25 14:50:07 +08:00
xinwen 11527b9033 [Update] i18n 2020-05-22 18:18:40 +08:00
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改 2020-05-21 20:35:44 +08:00
ibuler 3320e6105c [Update] 删掉没用的内容 2020-05-21 19:00:47 +08:00
xinwen 492b1c4311 [Update] org retrieve api 2020-05-21 16:09:42 +08:00
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id` 2020-05-21 15:40:41 +08:00
ibuler 701582fe38 [Update] 修改license的判断方法 2020-05-21 14:47:00 +08:00
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-20 19:35:48 +08:00
Bai 2e0eab9289 [Update] 修改翻译信息 2020-05-20 19:35:35 +08:00
ibuler 0cac8d66b3 [Update] 修改index api 2020-05-20 19:35:33 +08:00
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题 2020-05-20 18:20:01 +08:00
xinwen 245d28b03d [Update] 一些本地化 2020-05-20 17:45:50 +08:00
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only 2020-05-19 20:50:33 +08:00
Bai f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-19 20:36:41 +08:00
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段 2020-05-19 20:36:17 +08:00
Bai 63ff868553 [Update] 授权资产树返回org_id字段值 2020-05-19 19:36:19 +08:00
Bai b97deec1de [Update] openid 继续使用配置项 base_site_url 2020-05-19 18:24:26 +08:00
Bai be3fdac8a9 [Update] 修复API-key不能删除的问题 2020-05-19 15:28:31 +08:00
Bai 96afd82341 [Update] 修复任务列表，执行历史中stat汇总数据显示问题 2020-05-19 15:15:17 +08:00
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题 2020-05-19 11:47:49 +08:00
Bai 73c3de97b8 [Update] 取消用户资产页面中，资产详情系统用户值为undefine的问题 2020-05-18 18:14:19 +08:00
Bai e98626988b [Update] 解决开启OpenID，为用户强制启用MFA导致，登录时报错的问题 2020-05-18 18:02:37 +08:00
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View 2020-05-18 15:49:53 +08:00
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面 2020-05-18 15:40:54 +08:00
Bai 75edc26a10 [Update] 修改翻译，禁用资产提示不支持ansible的错误提示 2020-05-18 15:25:24 +08:00
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题 2020-05-18 15:24:55 +08:00
ibuler 76ef9b292b [Update] 修改public api 2020-05-18 14:55:16 +08:00
ibuler 1540cbdcaa [Update] 修改csv render 2020-05-18 11:52:50 +08:00
Bai e951b64b0a [Update] 修改版本号1.5.9 2020-05-14 16:14:17 +08:00
ibuler 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-14 14:51:05 +08:00
ibuler b529127461 [Update] 修改user role 2020-05-14 14:49:54 +08:00
Bai d878089ebd [Update] 用户资产详情Modal添加comment 2020-05-14 14:26:00 +08:00
Bai 4658a4c90f [Update] 修改向导文案 2020-05-14 11:00:24 +08:00
Bai d06ea2944e [Update] 修改Dashboard API 2020-05-14 10:53:30 +08:00
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-13 11:06:24 +08:00
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色 2020-05-13 11:05:58 +08:00
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error 2020-05-12 20:31:32 +08:00
ibuler 195cbbbe42 [Update] 修改profile serialzier 2020-05-12 17:57:35 +08:00
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段 2020-05-12 17:24:51 +08:00
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段 2020-05-12 17:09:36 +08:00
ibuler dd5bf546df [Update] 修改serialzier_class 2020-05-12 15:37:37 +08:00
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-11 19:28:24 +08:00
ibuler efc66cc7ee [Update] 默认关闭debug 2020-05-11 19:28:02 +08:00
Bai 4bd2681bf0 [Update] Merge from dev to lina 2020-05-11 17:43:48 +08:00
Bai 98e3adbb11 [Update] Merge from master to dev 2020-05-11 17:38:01 +08:00
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug 2020-05-11 16:56:52 +08:00
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id 2020-05-11 15:12:42 +08:00
Bai 0cff6ab29b [Update] Merge fromo dev to lina 2020-05-11 14:03:24 +08:00
ibuler cda677a30f [update] 修改remote apps的serializer 2020-05-11 12:35:33 +08:00
ibuler 2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 16:08:32 +08:00
ibuler 227f97c2f5 [Update] 修改remote apps 字段 2020-05-09 16:08:09 +08:00
老广 ad3231c8a3
Merge pull request #3982 from jumpserver/update-ops-migrate 
[Update] 重建 ops 0018 迁移脚本
 2020-05-09 01:54:37 -05:00
ibuler e39d8dce3c [Update] 修改fields 2020-05-09 14:52:44 +08:00
ibuler 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 14:51:47 +08:00
ibuler 0a7f63cc5e [Update] 修改remote app api 2020-05-09 14:51:19 +08:00
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 2020-05-09 14:50:22 +08:00
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981) 
* [Update] 修改翻译

* [Update] 修改翻译2
 2020-05-09 13:29:39 +08:00
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息 2020-05-09 11:29:25 +08:00
老广 9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis 
[Add] audits apis
 2020-05-08 08:04:14 -05:00
Eric 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field 2020-05-08 20:58:13 +08:00
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名 2020-05-08 20:02:00 +08:00
xinwen e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +08:00
Bai 185c53d311 [Update] Merge from master to dev 2020-05-08 16:40:07 +08:00
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org 
[Update] 优化仪表盘、组织详情页
 2020-05-08 16:27:49 +08:00
ibuler c6ed6d8acb [Update] 去掉debug信息 2020-05-08 15:58:00 +08:00
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug 2020-05-08 15:53:58 +08:00
Bai e48dbabef2 [Update] 修改翻译 2020-05-08 15:50:01 +08:00