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

Feature/deletion by marking as removed #300

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from

Conversation

andreysavihin
Copy link
Member

No description provided.

…ded into two operations: marking content as removed and deleting directly
- FileDeleteOperation: removed IgnoreException parameter
- FileOperationsManager: added PublishHiddenDelete method
…letion-by-marking-as-removed

# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
…letion-by-marking-as-removed

# Conflicts:
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Service/CleanupMarkedEntries/CleanupMarkedEntriesLauncher.cs
…letion-by-marking-as-removed

# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
…letion-by-marking-as-removed

# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Service/Cleanup/AutoCleanTrashService.cs
#	products/ASC.Files/Service/Startup.cs
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.

1 participant