Commit Graph

7199 Commits

Author SHA1 Message Date
“怀磊”
4b75d90090 fix: 修复crontab月组件名称错误问题 2021-10-20 19:53:10 +08:00
“怀磊”
7dd11f1259 fix: 修复crontab选择月 日的时间重置问题 2021-10-20 19:53:10 +08:00
ibuler
761eb0c3b1 perf: 修改ldap密码不是必填 2021-10-20 19:16:15 +08:00
“怀磊”
f7fb35e625 fix: 修复资产授权列表-来自工单,否显示空 2021-10-20 19:14:27 +08:00
fit2bot
224b13b4e7
perf: 整理 acl 位置 (#734)
* stash

* s

* 界面调整

* feat: 添加分时段选择组件

* feat: 添加分时段选择组件

* feat: 分时段登录组件创建时传参

* 分时登陆

* feat: 分时段组件展示默认数据

* feat: 分时段选中时间在详情里展示

* alc 部分优化

* fix: 修复用户规则登录error报错

* feat: 调整规则详情-时段展示

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: “怀磊” <2280131253@qq.com>
2021-10-20 18:56:59 +08:00
“怀磊”
ae9b3f2707 style: 修复跳转链接文本溢出长度问题 2021-10-20 14:47:12 +08:00
Michael Bai
0675f22181 fix: 用户登录日志添加reason_display字段 2021-10-19 15:29:39 +08:00
fit2bot
92dd661a3b
登录验证可配置 (#1092)
* 登录验证可配置

* perf: 修改安全内容设置

* perf: 还原yarn

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
2021-10-18 14:50:57 +08:00
“怀磊”
1926cdde15 style: table跳转链接文本溢出显示省略号随页面宽度变化 2021-10-15 15:28:00 +08:00
fit2bot
3e60c9501e
feat: 资产详情添加授权用户列表页 (#1093)
* feat: 资产详情添加授权用户列表页

* feat: 取消console log

* perf: 优化一下前端

* feat: 修改授权用户组分隔符

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: ibuler <ibuler@qq.com>
2021-10-15 15:02:31 +08:00
“怀磊”
c86fb5cfde fix: 全局导出公告组件 2021-10-12 16:11:20 +08:00
“怀磊”
d8e1e14bd6 feat: crontab 组件封装 2021-10-12 11:13:30 +08:00
“怀磊”
bb9e9a87d0 feat: 列表增加定时执行字段展示 2021-10-12 10:52:18 +08:00
“怀磊”
96506acc9b feat: 授权列表来自工单,是显示对勾 2021-10-12 10:29:01 +08:00
ibuler
9a5171a1bf perf: 优化公告 2021-10-12 10:27:12 +08:00
Jiangjie.Bai
d1f61797a5
Merge pull request #1085 from jumpserver/pr@dev@feat_annoucement
perf: 完成公告功能
2021-09-29 14:59:42 +08:00
ibuler
30b936330c perf: 优化翻译 2021-09-28 18:59:34 +08:00
ibuler
6f5db82ce3 perf: 优化公告 2021-09-28 18:09:34 +08:00
ibuler
9fcc9bc9da perf: 完成公告功能 2021-09-28 17:02:27 +08:00
ibuler
972b7276cf feat: 添加公告功能 2021-09-28 10:20:39 +08:00
ibuler
8db10e806a Merge branch 'dev' of github.com:jumpserver/lina into dev 2021-09-27 15:40:02 +08:00
fit2bot
1cb6e49785
perf: 优化站内信 (#1082)
* perf: 修改不再存储 .env.devlopement

* perf: 优化站内信

Co-authored-by: ibuler <ibuler@qq.com>
2021-09-27 15:40:00 +08:00
ibuler
8950fadfa1 Merge branch 'dev' of github.com:jumpserver/lina into dev 2021-09-27 14:54:22 +08:00
fit2bot
e32d4e7ee0
perf: 优化弹窗 (#1081)
* perf: 修改不再存储 .env.devlopement

* perf: 优化弹窗

Co-authored-by: ibuler <ibuler@qq.com>
2021-09-27 14:54:14 +08:00
fit2bot
a382c82732
perf: 优化代码,搜索 (#1080)
* perf: 修改不再存储 .env.devlopement

* perf: 优化代码,搜索

Co-authored-by: ibuler <ibuler@qq.com>
2021-09-27 14:29:37 +08:00
ibuler
fa458cd456 Merge branch 'dev' of github.com:jumpserver/lina into dev 2021-09-27 14:23:10 +08:00
fit2bot
731d01450f
fix: 修复setting中forget url 多处显示的问题 (#1079)
* perf: 修改不再存储 .env.devlopement

* fix: 修复setting中forget url 多处显示的问题

Co-authored-by: ibuler <ibuler@qq.com>
2021-09-27 14:22:51 +08:00
ibuler
bf97d82626 Merge branch 'dev' of github.com:jumpserver/lina into dev 2021-09-24 15:11:04 +08:00
Michael Bai
49b8e0b33a fix: 修复邮件测试参数传递 2021-09-24 14:15:09 +08:00
ibuler
5a913e4d3a branch -D pr@dev@perf_env_file
Merge branch 'dev' of github.com:jumpserver/lina into dev
2021-09-24 13:29:22 +08:00
ibuler
2983f89f54 perf: 修改不再存储 .env.devlopement 2021-09-24 13:29:00 +08:00
ibuler
87a0384949 perf: 修改不再存储 .env.devlopement 2021-09-24 13:20:39 +08:00
ibuler
d36fe8aa94 perf: 修复 asset select 2021-09-24 13:14:04 +08:00
“怀磊”
5764ddc271 fix: 修复webpack配置报错 2021-09-23 13:56:01 +08:00
“怀磊”
edbdef3f58 perf: 增加webpack别名配置 2021-09-22 18:18:52 +08:00
feng626
5d308ac546 perf: 工单优化 2021-09-22 17:20:18 +08:00
ibuler
986cf6b4f7 perf: 修复dialog 不能滚动问题 2021-09-22 17:02:17 +08:00
ibuler
6cbac3c875 fix: 修复select2初始可能报错的bug
perf: 去掉debug
2021-09-18 15:05:44 +08:00
feng626
09a04efe1a
Merge pull request #1062 from jumpserver/pr@dev@ticket_perf
perf: 工单 优化
2021-09-17 15:50:53 +08:00
feng626
d5b631c012 perf: 工单 优化 2021-09-17 15:40:02 +08:00
Jiangjie.Bai
7e8de4c73b
Merge pull request #1061 from jumpserver/dev
merge: dev to master
2021-09-16 20:16:02 +08:00
老广
47a0641fed
Merge pull request #1060 from jumpserver/pr@dev@perF_setting
perf: 修改setting
2021-09-16 20:02:35 +08:00
ibuler
ad118c5eda perf: 修改setting 2021-09-16 20:01:38 +08:00
老广
9bd3b37371
Merge pull request #1059 from jumpserver/dev
Merge dev to master
2021-09-16 19:33:01 +08:00
ibuler
274f50da95 fix: 修改select2 2021-09-16 19:09:55 +08:00
xinwen
8f87c42c8c fix: Otp 绑定问题 2021-09-16 19:09:34 +08:00
ibuler
35c793785c perf: 优化 detail formatter 2021-09-16 16:54:01 +08:00
feng626
abe176831b fix: 修复数据库改密bug 2021-09-16 16:53:41 +08:00
xinwen
c97512c99b fix: 重置用户密码提示消息 2021-09-16 16:46:43 +08:00
Jiangjie.Bai
6a8553ddfd
Merge pull request #1053 from jumpserver/dev
v2.14.0 rc3
2021-09-15 21:06:24 +08:00