ukui/peony
0
0
Fork 0
mirror of https://github.com/ukui/peony.git synced 2026-03-09 09:21:10 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,185 Commits 15 Branches 54 Tags
dev-unity
Commit Graph

99 Commits

Author SHA1 Message Date
zhaikangning
83420413d2 Merge from master and solve conflicts 2021-02-02 17:55:29 +08:00
MeganHemh
82cb000878 Copyright change. 2021-01-25 20:57:05 +08:00
zhaikangning
834ca7a42c Merge the master branch code to solve the conflicts of the mainwindow, sidebar and other codes 2021-01-18 09:16:10 +08:00
handsome-feng
30f3b2b342 Remove useless desktop-screen 2021-01-12 08:04:24 +00:00
zhaikangning
4ca12c369f Merge branch 'master' of github.com:ukui/peony into dev-unity 2020-12-18 16:44:22 +08:00
dingjingmaster
cb9fc8f368 favorite:/// 2020-12-16 11:45:04 +08:00
zhaikangning
522f385547 Merge the master code 2020-12-10 21:09:15 +08:00
dingjingmaster
357fe1fd2d [FIX] Modify the user interface for login FTP 
[LINK]
 2020-12-10 16:26:53 +08:00
zhaikangning
ee3131b7eb Merge the master code 2020-12-10 10:23:17 +08:00
Yue-Lan
7c7590796f update debian/copyright. 2020-12-08 15:22:08 +08:00
zhaikangning
78007a4b28 Merge the master code 2020-12-04 17:01:25 +08:00
handsome-feng
00c31d6a84 update changelog 2020-11-28 16:17:33 +08:00
zhaikangning
7b991bd0cd merge code from master 2020-11-21 09:54:54 +08:00
MeganHemh
18e00b9b8b Cancel "Revert "给桌面添加黑白名单功能 (#481)"" 
This reverts commit 517e2b0c9d.
 2020-11-19 11:59:55 +08:00
Yue-Lan
517e2b0c9d Revert "给桌面添加黑白名单功能 (#481)" 
This reverts commit 3edf7a96f4.
 2020-11-19 11:24:42 +08:00
renpeijia
3edf7a96f4 给桌面添加黑白名单功能 (#481) 
* feature:add black and white list function

* 解决当配置文件为空的时候，black and white list功能异常的问题
 2020-11-19 09:41:59 +08:00
zhaikangning
0b444ac73a Merge master into dev-unity 2020-11-13 09:23:53 +08:00
Yue-Lan
879e8c839b debian/control: add gvfs to libpeony3 depends. 2020-11-07 09:35:21 +08:00
zhangpengfei
27f1bf29bc Fix PC desktop and tablet desktop conflicts;Fixed bug in wallpaper display error on first startup. 2020-10-20 18:10:00 +08:00
MeganHemh
1081603abf Fix dependent package name issue. 2020-10-09 15:54:44 +08:00
MeganHemh
6f2b432659 Add file operation warning and error audio prompt. 
Link:http://172.17.66.192/biz/bug-view-18432.html
 2020-10-08 17:25:35 +08:00
renpeijia
f6c64bb451 Feature:office和视频文件的缩略图显示功能 
Link：http://172.17.66.192/biz/story-view-2763-1-project-455.html
    本次修改内容：[1]添加copyright header
                  [2]添加研发需求链接

    [KEYWORDS ] thumbnail
    [TO SOLVE ] thumbnail
    [TEST SUGGESTION] 不同格式的office文件和视频文件
    [SUBMIT BY] renpeijia
    [REVIEW BY] 兰悦
    [TEST   BY]
 2020-09-08 11:09:08 +08:00
handsome-feng
8b2352146a Update changelog 2020-09-07 17:39:21 +08:00
handsome-feng
11b18f859a symbols -> shlibs, fix .qm install warnings 2020-09-04 09:46:39 +08:00
MeganHemh
1660259585 Fix arm64 and ppc64el arch build fail issue. 2020-08-27 14:14:38 +08:00