Commit Graph

500 Commits

Author SHA1 Message Date
SunShine55
fb59af1eec Merge branch 'master' of gitee.com:openharmony/applications_dlp_manager into master
Signed-off-by: SunShine55 <18772101563@163.com>
2024-03-11 10:18:45 +08:00
li-li-wang
12eda4922e viewAbility对外暴露且未合理校验
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-03-11 09:00:57 +08:00
SunShine55
1c8639b12a Merge branch 'master' of gitee.com:openharmony/applications_dlp_manager into master
Signed-off-by: SunShine55 <18772101563@163.com>
2024-03-08 06:09:27 +00:00
openharmony_ci
f0610c9637
!126 代码告警处理
Merge pull request !126 from 王力量/Setting_Weekly
2024-03-08 04:10:41 +00:00
SunShine55
d309572545 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	entry/src/main/ets/common/constant.ets
#	entry/src/main/ets/common/encryptionComponents/AddStaff2PC.ets
2024-03-08 11:58:16 +08:00
SunShine55
8492a482d1 客户端RichEditor适配
Signed-off-by: SunShine55 <18772101563@163.com>
2024-03-08 11:54:34 +08:00
SunShine55
8dd48c6386 客户端RichEditor适配
Signed-off-by: SunShine55 <18772101563@163.com>
2024-03-08 10:51:34 +08:00
li-li-wang
9ccbd01a04 代码告警处理
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-03-06 17:13:24 +08:00
openharmony_ci
f42c5d4358
!125 第一个文管点击加密保护,第二个文管点击加密保护后,第一个文管的加密保护页面消失
Merge pull request !125 from 王力量/Setting_Weekly
2024-03-04 13:21:41 +00:00
li-li-wang
4d2d276f40 第一个文管点击加密保护,第二个文管点击加密保护后,第一个文管的加密保护页面消失
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-03-04 14:08:38 +08:00
openharmony_ci
1ac8fa639d
!124 第一个文管点击加密保护,第二个文管点击加密保护后,第一个文管的加密保护页面消失
Merge pull request !124 from 王力量/Setting_Weekly
2024-02-29 06:08:33 +00:00
li-li-wang
512a6f4cd0 第一个文管点击加密保护,第二个文管点击加密保护后,第一个文管的加密保护页面消失
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-02-29 09:46:26 +08:00
openharmony_ci
62ea9c2d3b
!123 翻译提交
Merge pull request !123 from 王力量/Setting_Weekly
2024-02-27 13:01:59 +00:00
li-li-wang
c41114c60b 翻译提交
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-02-27 18:56:55 +08:00
openharmony_ci
75205f6c5a
!117 fix edit tips
Merge pull request !117 from xuqian0131/master
2024-02-26 03:31:22 +00:00
xuqian
bdf9f2dd31 fix edit tips
Signed-off-by: xuqian <xuqian65@huawei.com>
2024-02-26 09:55:11 +08:00
openharmony_ci
d7d0214030
!119 沙箱内重复加密失败
Merge pull request !119 from 王力量/Setting_Weekly
2024-02-07 08:01:46 +00:00
li-li-wang
6be269cbf7 沙箱内重复加密失败
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-02-07 14:47:40 +08:00
openharmony_ci
b60e0976e4
!116 翻译回稿上线
Merge pull request !116 from 王力量/zichuan_Weekly
2024-02-06 07:53:42 +00:00
li-li-wang
7f850c5d30 翻译回稿上线
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-02-06 10:22:11 +08:00
openharmony_ci
67366ae62e
!111 指定所有人加密后,再更改加密,页面信息显示缺少
Merge pull request !111 from SunShine55/master
2024-01-26 08:47:13 +00:00
SunShine55
3cfeff282a Merge remote-tracking branch 'origin/master' 2024-01-26 15:05:55 +08:00
SunShine55
5654722842 Merge remote-tracking branch 'origin/master' 2024-01-26 15:03:38 +08:00
SunShine55
a406db82db Merge remote-tracking branch 'origin/master'
# Conflicts:
#	entry/src/main/ets/pages/changeEncryption.ets
2024-01-26 15:00:16 +08:00
SunShine55
13116341fe 指定所有人加密后,再更改加密,页面信息显示缺少
Signed-off-by: SunShine55 <18772101563@163.com>
2024-01-26 14:55:01 +08:00
openharmony_ci
4c7c5fb7a7
!110 系统登陆状态失效,断开网络点击登录,提示语修改
Merge pull request !110 from 王力量/set_Weekly
2024-01-26 06:27:55 +00:00
SunShine55
ac7bb517ee 指定所有人加密后,再更改加密,页面信息显示缺少
Signed-off-by: SunShine55 <18772101563@163.com>
2024-01-26 11:12:14 +08:00
li-li-wang
c8215a1e48 系统登陆状态失效,断开网络点击登录,提示语修改
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-26 09:18:07 +08:00
openharmony_ci
22e43cde65
!109 打开DLP文件后,加密新DLP文件,新DLP文件无法打开
Merge pull request !109 from 王力量/set_Weekly
2024-01-25 09:19:12 +00:00
li-li-wang
2f8d9d2cf0 打开DLP文件后,加密新DLP文件,新DLP文件无法打开
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-25 14:08:44 +08:00
openharmony_ci
17875664e5
!107 优化添加最大用户数,展示胶囊信息
Merge pull request !107 from SunShine55/master
2024-01-25 05:56:05 +00:00
openharmony_ci
fa88c9d359
!108 字串翻译回稿上线代码
Merge pull request !108 from 王力量/set_Weekly
2024-01-25 02:57:37 +00:00
li-li-wang
1f1bc011f6 字串翻译回稿上线代码
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-24 16:28:26 +08:00
SunShine55
ba3ce6ea0b 优化添加最大用户数,展示胶囊信息
Signed-off-by: SunShine55 <18772101563@163.com>
2024-01-23 17:27:28 +08:00
openharmony_ci
313353798f
!105 超长文本展示计算高度
Merge pull request !105 from 王力量/set_Weekly
2024-01-22 07:06:06 +00:00
openharmony_ci
93f7b44a07
!106 打印权限移到编译 删除其他完全控制权限选项
Merge pull request !106 from xuqian0131/master
2024-01-22 03:29:00 +00:00
xuqian
4e3f0bd379 add print access control for edit user
Signed-off-by: xuqian <xuqian65@huawei.com>
2024-01-19 16:03:02 +08:00
li-li-wang
9fa227a628 超长文本展示计算高度
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-19 15:39:46 +08:00
openharmony_ci
d7578240dd
!104 fix DFX get size
Merge pull request !104 from baoyang/master
2024-01-17 02:40:07 +00:00
baoyang
2e5eb1e1b0 fix DFX get size
Signed-off-by: baoyang <baoyang9@huawei.com>
2024-01-16 12:15:48 +00:00
openharmony_ci
73ce1fcb82
!103 fix DFX
Merge pull request !103 from baoyang/master
2024-01-15 10:20:11 +00:00
baoyang
6298e81289 fix DFX
Signed-off-by: baoyang <baoyang9@huawei.com>
2024-01-15 08:42:15 +00:00
openharmony_ci
2cc0a8776d
!102 更新报错信息
Merge pull request !102 from baoyang/master
2024-01-15 07:12:06 +00:00
baoyang
023a53145d change error message
Signed-off-by: baoyang <baoyang9@huawei.com>
2024-01-15 02:10:12 +00:00
openharmony_ci
dcd4ddc421
!101 记事本另存为文案修改
Merge pull request !101 from 王力量/lingcunwei
2024-01-12 10:09:02 +00:00
li-li-wang
62dc2f0be5 记事本另存为文案修改
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-12 15:39:23 +08:00
openharmony_ci
1b428cb614
!100 胶囊数量计算和英文字串翻译
Merge pull request !100 from 王力量/zichuan_Weekly
2024-01-11 14:00:16 +00:00
王力量
abeafca71a Merge branch 'master' of gitee.com:openharmony/applications_dlp_manager into zichuan_Weekly
Signed-off-by: 王力量 <wangliliang5@huawei.com>
2024-01-11 12:03:45 +00:00
openharmony_ci
b4122a9d3a
!99 fix string error
Merge pull request !99 from baoyang/master
2024-01-11 11:49:43 +00:00
li-li-wang
3ebf7c32c3 胶囊数量计算
Signed-off-by: li-li-wang <wangliliang5@huawei.com>
2024-01-11 19:18:42 +08:00