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

chore: Merge branch 'master' into develop/snipe #2019

Merged
merged 19 commits into from
Jun 17, 2024

Conversation

rb-union
Copy link

@rb-union rb-union commented Jun 14, 2024

From 725e5ea
to 59e7bb3

Log: Merge 'master' branch

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Jun 14, 2024

Deepin Obs Bot
Starting find obs webhook event and retrigger!

@rb-union rb-union force-pushed the develop/snipe_merge branch 2 times, most recently from eb13802 to 59e7bb3 Compare June 17, 2024 01:27
@rb-union rb-union changed the title Develop/snipe merge recent changes chore: Merge branch 'master' into develop/snipe_merge Jun 17, 2024
@rb-union rb-union changed the title chore: Merge branch 'master' into develop/snipe_merge chore: Merge branch 'master' into develop/snipe Jun 17, 2024
@rb-union rb-union force-pushed the develop/snipe_merge branch 2 times, most recently from 71ef000 to b90acd6 Compare June 17, 2024 05:38
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Johnson-zs, rb-union

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Jun 17, 2024

This pr cannot be merged! (status: unstable)

liyigang1 and others added 19 commits June 17, 2024 14:12
…istory

Add option to clear file manager search records in settings

Log: Custom Task Turn to Main Line: dde-file-manager Clears Search History
Task: https://pms.uniontech.com/bug-view-252515.html
… will not be able to enter any directory when a new window is opened

Set filedailog to only open in the current window

Log: After checking the box, the document management selection window will not be able to enter any directory when a new window is opened
Bug: https://pms.uniontech.com/bug-view-255979.html
…s from being deleted

Support Ctrl+Y recovery undo (Ctrl+Z) operation to prevent files from being deleted

Log: Support Ctrl+Y recovery undo (Ctrl+Z) operation to prevent files from being deleted
Task: https://pms.uniontech.com/task-view-341623.html
…to open a file

The alt+down shortcut should not be to open a property box, but to open a file

Log: The alt+down shortcut should not be to open a property box, but to open a file
Bug: https://pms.uniontech.com/bug-view-256051.html
…ore resuming the transfer. The system's displayed transfer speed does not match the actual speed

Modify the calculation method so that only the running status is counted as the write time

Log: The transfer of big data files is paused for about 5 minutes before resuming the transfer. The system's displayed transfer speed does not match the actual speed
Bug: https://pms.uniontech.com/bug-view-256437.html
Create an index when modifying the search for the current directory

Log: The full-text search function is not effective
Bug: https://pms.uniontech.com/bug-view-256997.html
Before the fix, QProcess was created in the main thread and used in the
child thread, which triggered Qt warning logs and caused
dde-file-manager-daemon to crash. The solution is to complete the
creation and use of QProcess in the child thread.

Log: fix segmentation fault
Wrong parameter passed in

Log: Unable to delete files in vault
Bug: https://pms.uniontech.com/bug-view-257793.html
…n will skip the previous operation's revocation

No processing was done after cancellation

Log:  After selecting "Cancel" when revoking, attempting to do so again will skip the previous operation's revocation
Bug: https://pms.uniontech.com/bug-view-257853.html
…ndone

Template URL not saved

Log: Create a new non-text document, after Ctrl+Z, Ctrl+Y cannot be undone
Bug: https://pms.uniontech.com/bug-view-257805.html
…n will skip the previous operation's revocation

The stack order of the save file operation is incorrect

Log: After selecting "Cancel" when revoking, attempting to do so again will skip the previous operation's revocation
Bug: https://pms.uniontech.com/bug-view-257853.html
Incorrect search status setting

Log: The full-text search function is not effective
Bug: https://pms.uniontech.com/bug-view-256997.html
…eeze

Put the obtained UUID into the thread for execution

Log: Fixed some known issues
Bug: https://pms.uniontech.com/bug-view-254659.html
…o operation timeout

Try again and start copying the current file from scratch

Log: The testing machine failed to copy files on the FTP server due to operation timeout
Bug: https://pms.uniontech.com/bug-view-254803.html
…o operation timeout

add translations

Log: The testing machine failed to copy files on the FTP server due to operation timeout
Bug: https://pms.uniontech.com/bug-view-254803.html
…nd content cannot be copied between virtual machine and physical machine

Error in writing clipboard string judgment

Log: After installing VM Tools on V23 VMware virtual machine, files and content cannot be copied between virtual machine and physical machine
Bug: https://pms.uniontech.com/bug-view-256725.html
sync by github workflow

Log: none
Influence: none
Add the AM path to vault white process.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-259595.html
@deepin-ci-robot
Copy link

deepin pr auto review

Fix bad description for error messages

@Johnson-zs
Copy link
Contributor

/merge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Jun 17, 2024

This pr cannot be merged! (status: unstable)

@Johnson-zs Johnson-zs merged commit 6952a83 into linuxdeepin:develop/snipe Jun 17, 2024
15 of 17 checks passed
@rb-union rb-union deleted the develop/snipe_merge branch June 17, 2024 06:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants