Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复教育版1071从文件管理器打开帮助手册时间较长 #483

Merged
merged 94 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
3cf5022
feat: Task-131387 适配新镜像
PythonMan-YueYue May 20, 2022
24028a5
fix: Bug-133971 修复snipe分支打包失败问题
PythonMan-YueYue May 23, 2022
0525074
feat: Task-148811 玲珑包 linhlong.yaml文件合入代码
PythonMan-YueYue Jun 20, 2022
dda76b4
feat: Task-151833 玲珑包打包处理
PythonMan-YueYue Jun 20, 2022
801be56
feat: Task-151833 玲珑包打包处理
PythonMan-YueYue Jun 21, 2022
634b551
feat: Task-151833 玲珑包打包处理,添加xcb-util
PythonMan-YueYue Jun 21, 2022
40b6ac4
feat: Task-151833 玲珑包打包处理,添加icu
PythonMan-YueYue Jun 21, 2022
5009108
feat: Task-151833 玲珑包打包处理,qtwebengine添加runtime
PythonMan-YueYue Jun 21, 2022
a46f990
feat: Task-151833 玲珑包打包处理,libevent
PythonMan-YueYue Jun 21, 2022
1d6b509
feat: Task-151833 玲珑包打包处理,添加re2
PythonMan-YueYue Jun 21, 2022
2146827
feat: Task-151833 玲珑包打包处理,添加pciutils
PythonMan-YueYue Jun 21, 2022
287d881
feat: Task-151833 玲珑包打包处理,添加libvpx
PythonMan-YueYue Jun 21, 2022
2344d28
fix: 搜索框中输入多个特殊字符,且包含“%”,按enter键,界面显示空白,返回按钮缺失
Hzlwwwwt Jul 8, 2022
75d4909
fix: V23帮助手册无法打开
Hzlwwwwt Jul 27, 2022
fe8f9b3
fix: 窗口界面显示空白,无内容
Hzlwwwwt Aug 11, 2022
09d0491
fix: 解决玲珑环境下搜索无结果
Hzlwwwwt Sep 19, 2022
ccd007f
fix: 补充提交文件,导致dmanHelper无法启动
Hzlwwwwt Sep 21, 2022
0f306f7
fix: 玲珑环境修改Dbus-Service服务启动配置
starhcq Sep 22, 2022
0c433ce
fix: 玲珑添加patch更新
starhcq Sep 22, 2022
a292d7d
fix: 提交patch修改
Hzlwwwwt Sep 22, 2022
a038e92
fix: 帮助手册搜索无内容内容
Hzlwwwwt Sep 27, 2022
962b39b
fix: 【帮助手册】【wayland】打开帮助手册时,内容显示空白
Hzlwwwwt Sep 28, 2022
5190ae7
feat: 帮助手册玲珑环境下适配MD文件路径
Hzlwwwwt Oct 11, 2022
ac6783e
fix: 帮助手册玲珑适配.
Hzlwwwwt Nov 25, 2022
2260c31
fix: 修改帮助手册MD文件路径筛选
Hzlwwwwt Nov 28, 2022
bff9ae4
fix: 修改帮助手册玲珑应用图标英文问题
Hzlwwwwt Nov 28, 2022
3f7b74a
fix: wayland下任务栏图标显示错误
Hzlwwwwt Nov 29, 2022
652be39
fix: 搜索框输入“%+任意字符”搜索后,帮助手册界面中所有控件消失
Hzlwwwwt Dec 2, 2022
655701f
fix: 帮助手册开启时,更新其他应用,帮助手册界面无“当前内容已更新”气泡提示
Hzlwwwwt Dec 13, 2022
0f0563a
fix: 双屏扩展时,启动帮助手册,应用未居中显示
Hzlwwwwt Dec 13, 2022
ed6e337
fix: 数据库中已有数据不能及时同步其他应用的md内容更新
Hzlwwwwt Dec 27, 2022
8fc2693
fix: 【帮助手册】没有应用的帮助内容介绍
Hzlwwwwt Jan 9, 2023
784ed15
fix: dde接口适配,需要新增获取参数
Hzlwwwwt Jan 9, 2023
6b26e0b
chore: V23分支开源合规整改 (#417)
starhcq Jan 30, 2023
f975b7c
refactor(v23): Merge branch 'develop/snipe'
BLumia Feb 1, 2023
2a8279c
chore: fix some compile problems (#420)
starhcq Feb 1, 2023
1d2ad8d
chore: fix tests compile problems
starhcq Feb 2, 2023
1971693
feat: adapt V23 DDE DBus interfaces (#422)
starhcq Feb 2, 2023
904ca7b
fix: 修复玲珑打包加载patch失败的问题 (#423)
starhcq Feb 2, 2023
69c71a0
fix: patch文件更新 (#424)
starhcq Feb 2, 2023
258e317
chore: debian目录下废弃patches补丁清理 (#425)
starhcq Feb 3, 2023
6e0cb9b
Chore: Update version to 6.0.1 (#426)
starhcq Feb 14, 2023
0a6c71b
chore: Sync by
Feb 14, 2023
5baae27
chore: 更新翻译 (#427)
starhcq Feb 16, 2023
f0beb10
chore: update version 6.0.2 (#428)
starhcq Feb 16, 2023
845a407
fix: 修复主界面应用名未翻译为中文的问题 (#429) (#430)
starhcq Feb 21, 2023
3ffd58b
chore: 去掉玲珑构建相关配置 (#431)
starhcq Feb 28, 2023
1b32312
chore: add linglong build patch (#432)
starhcq Feb 28, 2023
bfef9ba
fix: 修复pangw架构下,多次重启帮助手册,有概率打开延迟15秒以上的问题 (#433)
starhcq Mar 3, 2023
ffdc4da
fix: 修复应用图标显示撕裂图的问题 (#434)
starhcq Mar 7, 2023
1b3a118
chore: Update Version 6.0.3 (#436)
starhcq Mar 7, 2023
534cc71
chore: update version to 6.0.4 (#437)
starhcq Mar 10, 2023
e2c93f7
fix: 修复帮助手册打开图片,锁屏/解锁后,帮助手册无法操作的问题 (#438)
starhcq Mar 14, 2023
75c2ad9
chore(CI): add OBS workflows (#439)
tsic404 Mar 24, 2023
2cd4d49
chore(CI): fix typo (#440)
tsic404 Mar 24, 2023
c17be6f
chore: update version to 6.0.5 (#441)
starhcq Mar 30, 2023
b04c2f1
chore: Update version to 6.0.6(community) (#442)
starhcq Apr 25, 2023
29e9d6d
chore: Sync by https://github.com/linuxdeepin/.github/commit/2e5e092b…
May 10, 2023
688962a
chore: Sync by https://github.com/linuxdeepin/.github/commit/559e9116…
Jul 10, 2023
45212dd
fix: 修复系统启动后dmanHelper成为常驻进程的问题
starhcq Jul 26, 2023
35f8e3d
feat: support dtk 5.6.17
hillwoodroc Nov 13, 2023
6cd98a7
fix: missing app list
myml Jan 16, 2024
181776d
feat: add metainfo of dde
myml Jan 16, 2024
9b21371
chore: Release 6.0.7
myml Jan 16, 2024
a3ee49e
feat: New Quick Start and Video Guide modules added
feeengli Jan 19, 2024
fa082ca
fix: Unable to search for videos after switching the system language to
feeengli Jan 23, 2024
2e633df
fix: 搜索关键字为数字或英文,搜索结果中的视频链接无法打开
feeengli Jan 23, 2024
dab7c02
fix: 字体显示问题
feeengli Jan 24, 2024
77fd318
fix: 服务与支持位置错误
feeengli Jan 24, 2024
6423ae9
fix: 更新翻译
feeengli Jan 24, 2024
6789f99
chore: tag 6.0.8
feeengli Jan 26, 2024
6d0cb07
fix: 系统语言为藏语时视频名称被截断
feeengli Jan 26, 2024
2678bb7
fix: 搜索结果大图显示异常
feeengli Jan 30, 2024
7f8c68b
fix: 修改字体颜色
feeengli Jan 31, 2024
9a54da8
chore: tag 6.0.9
feeengli Feb 1, 2024
fba2c95
feat: 添加快速入门、视频指南资源文件
feeengli Feb 1, 2024
b96db87
chore: tag 6.0.10
feeengli Feb 1, 2024
d184cce
fix: 关于界面没有翻译
feeengli Feb 2, 2024
5788cfd
chore: 常用应用库文档更新
feeengli Feb 4, 2024
a38507b
chore: tag 6.0.11
feeengli Feb 5, 2024
6a91634
fix: 服务与支持按钮及首页UI问题修复
feeengli Feb 5, 2024
d1894fa
fix: 服务与支持进程未退出时再次打开失败
feeengli Feb 6, 2024
58e8733
chore: tag 6.0.12
feeengli Feb 21, 2024
ff02dc2
fix: 主页面字体调整、tooltip样式修改
feeengli Feb 23, 2024
31e09b3
fix: 更新快速入门文档
feeengli Mar 6, 2024
ddd2b1b
feat: 常用应用库页面添加应用商店入口
feeengli Mar 8, 2024
75d11eb
fix: 双屏扩展模式下,帮助手册在主屏最大化再还原,窗口会直接显示到副屏
feeengli Mar 8, 2024
3c6e171
chore: Update version to 6.0.13
starhcq Mar 13, 2024
269e741
fix: 老版本浏览器无法打开视频链接
feeengli Apr 10, 2024
2f984f0
chore: tag 6.0.14
feeengli Apr 10, 2024
c6900e8
fix: 快速入门文档图片显示错误
feeengli Apr 17, 2024
79336a0
fix: 控制中心无法打开文档子模块
feeengli Apr 23, 2024
9b58d7e
fix: Fix potential crash issues
starhcq Jun 5, 2024
f1e2323
fix: 修复教育版1071从文件管理器打开帮助手册时间较长
jeffshuai Jul 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/backup-to-gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,25 @@ jobs:
- name: Print log
run: |
jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}" -runid "${{ steps.generate-runid.outputs.RUN_ID }}"

backup-to-gitee:
if: github.repository_owner == 'linuxdeepin'
runs-on: ubuntu-latest
steps:
- name: create-repo
run: |
repo=${{ github.event.repository.name }}
homepage="https://github.com/linuxdeepin/${repo}"
description="mirror of ${homepage}"
# remove '.' prefix
repo=${repo#"."}
curl -X POST --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private": 1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN }}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}' || true
- name: push
run: |
git clone --bare https://github.com/linuxdeepin/${{ github.event.repository.name }}.git .git
repo=${{ github.event.repository.name }}
# remove '.' prefix
repo=${repo#"."}
git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN }}@gitee.com/linuxdeepin/${repo}.git
git push -f --all --prune origin
git push --tags origin
17 changes: 0 additions & 17 deletions .github/workflows/call-build-deb.yml

This file was deleted.

6 changes: 1 addition & 5 deletions .github/workflows/call-build-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@ on:
jobs:
check_job:
uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
secrets:
BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
secrets: inherit
3 changes: 1 addition & 2 deletions .github/workflows/call-chatOps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ on:
jobs:
chatopt:
uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
secrets:
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- run: export
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down
44 changes: 44 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
test_build:
steps:
- link_package:
source_project: deepin:Develop:dde
source_package: %{SCM_REPOSITORY_NAME}
target_project: deepin:CI

- configure_repositories:
project: deepin:CI
repositories:
- name: deepin_develop
paths:
- target_project: deepin:CI
target_repository: deepin_develop
architectures:
- x86_64
- aarch64

- name: debian
paths:
- target_project: deepin:CI
target_repository: debian_sid
architectures:
- x86_64

filters:
event: pull_request

tag_build:
steps:
- branch_package:
source_project: deepin:Develop:dde
source_package: %{SCM_REPOSITORY_NAME}
target_project: deepin:Unstable:dde
filters:
event: tag_push

commit_build:
steps:
- trigger_services:
project: deepin:Develop:dde
package: %{SCM_REPOSITORY_NAME}
filters:
event: push
12 changes: 11 additions & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co., Ltd. <>
Source: https://github.com/linuxdeepin/image-editor

# ci
Files: .github/*
Files: .github/* .obs/workflows.yml
Copyright: UnionTech Software Technology Co., Ltd.
License: CC0-1.0

Expand Down Expand Up @@ -63,6 +63,11 @@ Files: tests/*
Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

# patches
Files: patches/*
Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

# qt web
Files: src/web/toSearchMd/common/qwebchannel.js src/web/toManual/qwebchannel.js src/web_dist/toManual/qwebchannel.js src/web_dist/toSearchMd/qwebchannel.js
Copyright: 2016 The Qt Company Ltd.
Expand All @@ -73,3 +78,8 @@ License: BSD-3-Clause
Files: tests/src/third-party/stub/*
Copyright: 2019 coolxv
License: MIT

# assets
Files: manual-assets/*
Copyright: UnionTech Software Technology Co., Ltd.
License: LGPL-3.0-or-later
4 changes: 2 additions & 2 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ host = https://www.transifex.com
minimum_perc = 80
mode = developer

[deepin-manual.deepin-manual]
[o:linuxdeepin:p:deepin-manual:r:deepin-manual]
file_filter = translations/deepin-manual_<lang>.ts
source_file = translations/deepin-manual.ts
source_lang = en_US
type = QT

[deepin-manual.desktopts]
[o:linuxdeepin:p:deepin-manual:r:desktopts]
file_filter = translations/desktop/desktop_<lang>.ts
source_file = translations/desktop/desktop.ts
source_lang = en
Expand Down
2 changes: 2 additions & 0 deletions .tx/deepin.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[transifex]
branch = m23
108 changes: 108 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,111 @@
deepin-manual (6.0.15) unstable; urgency=medium

* Update version 6.0.15

-- shuaijie <[email protected]> Wed, 10 Jul 2024 21:44:01 +0800

deepin-manual (6.0.14) unstable; urgency=medium

* fix: unable to open video on older version of the system.

-- fengli <[email protected]> Wed, 10 Apr 2024 14:17:01 +0800

deepin-manual (6.0.13) unstable; urgency=medium

* fix: Main page font adjustment and tooltip style modification(Bug: 241593)
* fix: Update Quick Start Document
* feat: Add app store entrance to commonly used app library pages
* fix: In dual screen expansion mode, the help manual is maximized on the main screen before being restored, and the window will be directly displayed on the secondary screen(Bug: 244417)

-- houchengqiu <[email protected]> Wed, 13 Mar 2024 15:08:16 +0800

deepin-manual (6.0.12) unstable; urgency=medium

* fix some bugs.

-- fengli <[email protected]> Wed, 21 Feb 2024 16:53:13 +0800

deepin-manual (6.0.11) unstable; urgency=medium

* New version 6.0.11

-- fengli <[email protected]> Mon, 05 Feb 2024 16:20:12 +0800

deepin-manual (6.0.10) unstable; urgency=medium

* Add resource file

-- fengli <[email protected]> Thu, 01 Feb 2024 17:14:55 +0800

deepin-manual (6.0.9) unstable; urgency=medium

* Update version 6.0.9

-- fengli <[email protected]> Thu, 01 Feb 2024 14:15:33 +0800

deepin-manual (6.0.8) unstable; urgency=medium

* feat: New Quick Start and Video Guide modules added
* fix: Quick Start and Video Guide modules problem repair

-- fengli <[email protected]> Fri, 26 Jan 2024 11:37:47 +0800

deepin-manual (6.0.7) stable; urgency=medium

* chore: Sync by https://github.com/linuxdeepin/.github/commit/2e5e092ba3f86b16d1aabbabcf0bfd2ae65b19c8(Influence: none)
* chore: Sync by https://github.com/linuxdeepin/.github/commit/559e91167d4919644f37bbcf123eb0651c1528ea(Influence: none)
* fix: 修复系统启动后dmanHelper成为常驻进程的问题
* feat: support dtk 5.6.17
Thanks to Hillwood Yang
* fix: missing app list(Issue: https://github.com/linuxdeepin/developer-center/issues/6902)
* feat: add metainfo of dde

-- myml <[email protected]> Tue, 16 Jan 2024 13:55:52 +0800

deepin-manual (6.0.6) stable; urgency=medium

* Update version to 6.0.6. community

-- Deepin Packages Builder <[email protected]> Tue, 25 Apr 2023 11:07:12 +0800

deepin-manual (6.0.5) stable; urgency=medium

* Update Version 6.0.5

-- Deepin Packages Builder <[email protected]> Thu, 30 Mar 2023 15:40:34 +0800

deepin-manual (6.0.4) stable; urgency=medium

* Update Version 6.0.4

-- Deepin Packages Builder <[email protected]> Fri, 10 Mar 2023 10:17:23 +0800

deepin-manual (6.0.3) stable; urgency=medium

* Update Version 6.0.3

-- Deepin Packages Builder <[email protected]> Tue, 7 Mar 2023 11:11:35 +0800

deepin-manual (6.0.2) stable; urgency=medium

* Update Version 6.0.2

-- Deepin Packages Builder <[email protected]> Thu, 16 Feb 2023 14:48:35 +0800

deepin-manual (6.0.1) stable; urgency=medium

* V23 & V20 code merge to same branch
* Reinital version 6.0.1

-- Deepin Packages Builder <[email protected]> Tue, 14 Feb 2023 15:17:35 +0800

deepin-manual (6.0.0) stable; urgency=medium

* V23 code
* Adapt REUSE license

-- Deepin Packages Builder <[email protected]> Mon, 30 Jan 2023 17:36:35 +0800

deepin-manual (5.5.5) stable; urgency=medium

* Update manual
Expand Down
50 changes: 50 additions & 0 deletions linglong.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package:
id: org.deepin.manual
name: "deepin-manual"
version: 5.8.4
kind: app
description: |
manual for deepin os.

variables:
extra_args: |
-DVERSION=${VERSION}

runtime:
id: org.deepin.Runtime
version: 23.0.0

depends:
- id: qtwebengine
version: 5.15.3
type: runtime
- id: googletest
version: 1.8.1
- id: xcb-util
type: runtime
- id: icu
version: 63.1
type: runtime
- id: libevent
type: runtime
- id: re2
type: runtime
- id: pciutils
type: runtime
version: 3.5.2.4
- id: libvpx
type: runtime

source:
kind: local
patch: patches/fix-linglong.patch
build:
kind: manual
manual:
configure: |
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} ${extra_args} ..
make -j6
#make test
make -j install
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading