3908 Commits (7e16ce41e3416a3647f714341763482bfadb5486)

 

All Branches   

Search

Author	SHA1	Message	Date
ibuler	61a37731ec	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	6 years ago
ibuler	d3217b6a67	[Update] 修改版本号	6 years ago
BaiJiangJie	04266cc20b	[Update] 修改Copyright (#2649)	6 years ago
ibuler	4f36cf7dd1	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	6 years ago
ibuler	490041587b	[Update] 修改copyright	6 years ago
BaiJiangJie	3a3da94468	[Update] 修改预留/auth/login/页面方式(admin=1)；解决luna页面刷新不跳转openid认证的问题 (#2634)	6 years ago
BaiJiangJie	b7ad6cfe62	[Update] 防止 XSS (#2633) ... * [Bugfix] 修改管理用户列表显示bug * [Bugfix] 修复刷新批量命令页面的bug * [Update] 防止 XSS	6 years ago
ibuler	4463e7545d	[Update] 去掉多余的	6 years ago
ibuler	d0eafc8b8e	[Update] Merge	6 years ago
ibuler	8b98c20d68	[Update] xss	6 years ago
BaiJiangJie	caa5060ecd	[Update] 控制组织管理员不允许更新、删除超级用户；修复ViewSet API批量更新的bug (#2629) ... * [Update] 控制组织管理员不允许编辑（更新、删除）超级用户 - 待续（控制批量更新API） * [Update] 修改方法名称 * [Update] 控制组织管理员不允许批量更新包含超级用户的用户列表 * [Bugfix] 修复所有ViewSet API进行批量更新时rest_framework_bulk库内部的bug * [Update] 修改 OpenID Middleware 日志输出模式 info => debug	6 years ago
BaiJiangJie	aabcf7f31c	[Update] 授权列表下拉信息添加action字段 (#2618)	6 years ago
ibuler	40d48cdfe4	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	6 years ago
ibuler	8196537878	[Update] 去掉logger.info openid msg	6 years ago
BaiJiangJie	33a00f043b	[Bugfix] 修复创建azure类型的录像存储时前端的bug (#2617)	6 years ago
BaiJiangJie	f235e20153	[Feature] 授权规则添加 actions 选项，控制用户对资产的操作行为 (#2610) ... * [Feature] 1. perms actions - 添加 Action Model * [Feature] 2. perms actions - 添加 Action API * [Feature] 3. perms actions - 授权规则: 添加actions字段 * [Feature] 4. perms actions - 授权规则创建页面: 设置 actions 默认 all * [Feature] 5. perms actions - 资产授权工具: 动态给system_user设置actions属性; 修改授权相关的API-serializer类: 添加actions字段值 * [Feature] 6. perms actions - 更新API(用户使用系统用户连接资产时权限校验): 添加actions校验 * [Feature] 7. perms actions - 迁移文件中为已经存在的perms添加默认的action * [Feature] 8. perms actions - 创建授权规则时设置默认action(如果actions字段值为空) * [Feature] 9. check actions - 修改校验用户资产权限API逻辑(添加actions校验) * [Feature] 10. check actions - 修改注释 * [Feature] 11. check actions - 添加API: 获取用户指定资产和系统用户被授权的actions * [Feature] 12. check actions - 添加翻译信息	6 years ago
BaiJiangJie	cf2455c084	[Bugfix] 修复创建azure类型的录像存储时前端的bug (#2608)	6 years ago
BaiJiangJie	fc1068a9dc	[Update] 更新翻译 (#2599)	6 years ago
zhnxin	35a0ca1875	Update node.py (#2527) ... bugfix: node get_all_children逻辑	6 years ago
八千流	56519354b6	Email reset password (#2547) ... * [Update]更改英文登录界面标题，可两行 * [Update] 更改用户通过邮箱修改密码后，该链接就失效 * [Update]更改页面左上角logo_text图片 * [Update] 优化发送邮箱改密连接失效代码 * [Update] 优化发送邮箱改密连接失效代码(2) * [Update] 优化发送邮箱改密连接失效代码(3) * [Update] 更新interface一键恢复默认的翻译 * [Update] 更改登录失败 用户名密码错误信息的翻译 * [Update] 优化生成token并设置缓存的代码	6 years ago
jokimina	78e4e13fb9	[Bugfix] IsSuperUserOrAppUser deny app user (#2558)	6 years ago
八千流	699b8d9980	[Update] 修改批量更新资产url过长导致的错误 (#2571)	6 years ago
zbhlove100	ba9581801c	Update README.md	6 years ago
zbhlove100	0a5fdf4ea1	功能转为表格	6 years ago
zhangbohan	3849fa2b15	update readme	6 years ago
zhangbohan	0952cbc7c6	英文readme	6 years ago
zhangbohan	bb06c39dd4	更新readme	6 years ago
zhangbohan	d60dc31443	更新readme	6 years ago
老广	76b3cd8edd	Merge pull request #2583 from jumpserver/dev ... Dev	6 years ago
老广	638ba31694	Merge pull request #2582 from jumpserver/dev_bugfix_assets ... [Bugfix] 修复资产对象获取所有节点时的bug	6 years ago
BaiJiangJie	c31b169cae	[Bugfix] 修复资产对象获取所有节点时的bug	6 years ago
老广	fc167526ae	Merge pull request #2575 from jumpserver/dev ... [Bugfix] 修复OpenID判断退出登录的中间件逻辑的bug (#2574)	6 years ago
BaiJiangJie	55eff5eab9	[Bugfix] 修复OpenID判断退出登录的中间件逻辑的bug (#2574)	6 years ago
老广	f5a7f4e086	Merge pull request #2570 from jumpserver/dev ... Bugfix (#2569)	6 years ago
老广	f7b0932cdd	Bugfix (#2569) ... * [Update] 修改Logo 的位置 * [Update] 修改镜像build	6 years ago
老广	ba89ce8fb9	Merge pull request #2560 from jumpserver/dev ... [Update] 修复小问题 (#2557)	6 years ago
BaiJiangJie	9d62deeabe	[Update] 修复小问题 (#2557) ... * [Update] 修复小问题 * [Bugfix] 修复操作日志动作、资源类型过滤不成功的bug	6 years ago
老广	459b41f327	Merge pull request #2559 from jumpserver/dev ... [Update] 修复重定向的问题	6 years ago
ibuler	3062e3f64a	[Update] 修复重定向的问题	6 years ago
老广	c1362ca4e2	Merge pull request #2552 from jumpserver/dev ... Dev	6 years ago
ibuler	9d24912ad9	[Update] Merge	6 years ago
老广	db290609a8	Merge pull request #2551 from jumpserver/dev ... Dev	6 years ago
ibuler	4bc5eced6c	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	6 years ago
BaiJiangJie	b82a66c83d	[Update] 优化LDAP用户导入功能 (#2550)	6 years ago
ibuler	bf7079df9e	[Update] 修改logo	6 years ago
ibuler	f137c5740e	[Update] 添加openldap client	6 years ago
ibuler	ee47905966	[Update] 修改超时时间	6 years ago
fit2cloudrd	f6cd193f9e	Update README.md (#2548) ... * Dev (#2544) * [Update] 更新翻译 (#2541) * [Update] 更新缓存机制 * [Update] 增加task最大允许事件，并设置命令最大运行时间为60s * Update README.md	6 years ago
ibuler	a31775dd23	[Update] 整理 copyright 和 版本	6 years ago
老广	30ba1e5886	Merge pull request #2545 from jumpserver/dev ... Dev	6 years ago