54 Commits

Author SHA1 Message Date
Xin Li 68414a2cf6 Merge branch 'master' into 'master'
增加用户手册

See merge request kylin-desktop/ukui-notebook!22
2021-12-21 02:22:39 +00:00
zehui han 7c1f1da076 增加用户手册
+  * Bug:  95385 【便签】【用户手册】便签帮助手册未跳转到指定页面
+  * Bug:  67440 【便签本】从便签本打开帮助,没有直接跳到便签本的介绍
2021-12-20 17:58:56 +08:00
zehui han 3c10a918a0 Merge branch 'dev' into 'master'
修改UI bug#97268

See merge request kylin-desktop/ukui-notebook!19
2021-12-17 07:17:29 +00:00
Xin Li 457e19d2b3 fix(ui):bug #97268 2021-12-14 20:59:35 +08:00
Xin Li 527d7a218e Merge branch 'dev' into 'master'
修改SP2界面问题

See merge request kylin-desktop/ukui-notebook!18
2021-12-14 12:56:23 +00:00
Xin Li 7f5cce59ee [Merge] 解决冲突 branch 'master' into 'dev'
# Conflicts:
#   src/editPage.cpp
#   src/editPage.h
2021-12-13 06:41:09 +00:00
Xin Li 5700c1422e Use theme pop window instead of frameless windows. 2021-12-13 14:26:48 +08:00
Xin Li 361d37c745 Modify segment fault error... 2021-12-09 13:41:02 +08:00
Xin Li 668241ad65 Fix UI bugs. 2021-12-08 20:50:26 +08:00
Xin Li ab7c742e3a Fix Bug #93662. Modify List UI 2021-12-06 15:26:21 +08:00
Xin Li 806d218217 Modify UI bugs and add new interface 'get all notes' 2021-11-29 09:28:48 +08:00
Xin Li a2a8a6e157 Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-23 16:55:54 +08:00
Xin Li d3bb64b12b Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-23 16:55:21 +08:00
Xin Li 34a7200a2d Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-22 13:55:45 +08:00
Xin Li 97b40a51ee 修改颜色UI并合并launchpad最新代码 2021-11-22 13:55:11 +08:00
Xin Li cce2c7d472 Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-22 13:45:01 +08:00
Xin Li dc8a9d8c40 Change hover color, modify font color ui. 2021-11-22 13:42:41 +08:00
Xin Li e6f25952a5 同步Launchpad 2021-11-22 09:42:33 +08:00
Xin Li e9258919bf Fix bug #90510; 2021-11-22 07:22:19 +08:00
Xin Li c6492b7ba9 Modify UI according to designer's advise. 2021-11-18 17:30:19 +08:00
Xin Li 7ded815fb6 修改编码规范;修改点击字体颜色代码 2021-11-15 16:58:21 +08:00
zhaoyubiao dc97cc4c73 解决-bug82924插入图片便签贴列表显示异常-bug82019便签内部置顶与任务栏置顶不能正常联动 2021-11-15 14:12:45 +08:00
Xin Li 30509aae5c Sync launchpad 0038 2021-11-15 09:51:11 +08:00
zhaoyubiao 86353bd0f5 解决bug82842-78731-77228-77084-72031-69444 2021-11-10 02:24:37 +08:00
Xin Li 56a1dcf8cb 增加藏文桌面文件,同步changelog 2021-11-09 15:34:06 +08:00