Commit Graph

2953 Commits

Author SHA1 Message Date
cda77e1234 Merge branch 'develop' into bugfix/context-actions 2021-05-20 13:24:18 +03:00
3b7f1f60ec Web: Files: fixed loopTreeFolders 2021-05-20 11:17:50 +03:00
5de1182bfa Web: Files: fixed NewFilesPanel error 2021-05-19 18:55:12 +03:00
52750c607d Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions 2021-05-19 18:14:40 +03:00
f04a4560b4 Web: Files: moved getNewFiles to actions 2021-05-19 18:14:35 +03:00
e268b077df Web: Files: Store: Fixed displaying edit action for files with low access 2021-05-19 17:54:29 +03:00
666cc00a52 Web: Files: Store: Fixed copy action for shared files inside root. Added view action for edited files 2021-05-19 17:48:23 +03:00
03a71ae131 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
23c075859b Web: Files: moved mark as read to actions 2021-05-19 17:11:10 +03:00
1003c6fe15 Web: Files: Dialog: Added unsubscribe action for DeleteDialog 2021-05-19 17:03:03 +03:00
e5f066e074 Web: Files: Store: Added unsubscribeAction for FilesActionsStore 2021-05-19 16:54:17 +03:00
cf49743054 Web: Files: Store: Added unsubscribe mark for Dialog 2021-05-19 16:53:32 +03:00
98d9fb4e33 Web: Files: HOC: Added unsubscribe action 2021-05-19 16:52:38 +03:00
e4f10d16cb Server: Files: Controller: FilesController: Fixed model parse for delete share 2021-05-19 16:50:08 +03:00
2cd59d9014 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions 2021-05-19 13:55:13 +03:00
d5ff576188 Web: Files: Store: Added mark read action, added remove from list and mark read icons 2021-05-19 13:54:45 +03:00
49e70d1ccc Web: Files: removed useless code 2021-05-19 13:46:53 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
86952dd71e Merge branch 'develop' into bugfix/context-actions 2021-05-19 10:19:17 +03:00
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
1b4807c07a Files: fixed SetTagsNew for thirdparty 2021-05-18 20:10:48 +03:00
2f7b9102ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 20:06:42 +03:00
d9e17af9d5 OneDrive: fix DI 2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
Feature/remove wq
2021-05-18 19:04:34 +03:00
8ad59d282b Web: Files: Store: Added mark read button 2021-05-18 18:18:38 +03:00
2c6d06f304 Web: Files: fixed drag 2021-05-18 17:59:02 +03:00
bad58f32f2 Merge branch 'develop' into bugfix/context-actions 2021-05-18 11:05:43 +03:00
036a8595c2 Web: Files: fixed update badges new 2021-05-17 17:55:55 +03:00
002469c650 Web: Files: added progress to "mark as read" operation 2021-05-17 17:53:52 +03:00
ef8b4d8a3a Web: Files: removed useless code, fixed getting file icons 2021-05-17 17:43:05 +03:00
4b1c067d34 Web: Files: fixed badge new translation 2021-05-17 17:41:35 +03:00
f907244431 Web: Files: Store: Added remove from list button, fixed displaying separator and some actions inside context menu 2021-05-17 12:27:09 +03:00
85cb6b822a Merge branch 'develop' into bugfix/context-actions 2021-05-17 12:25:27 +03:00
8ba2d041f9 Merge branch 'develop' into bugfix/fixed-files-badges 2021-05-14 15:29:12 +03:00
31752e64b4 fixed warnings 2021-05-14 15:26:18 +03:00
0792920677 Web: Files: hid the edit icon if the file is locked 2021-05-14 14:11:16 +03:00
fe38eb0f44 Web: Files: fixed locked badge 2021-05-14 14:10:08 +03:00
eb628d3703 Merge branch 'develop' into bugfix/enable-favorites-recent-settings 2021-05-14 11:34:10 +03:00
1a58007fcd Web: Common: removed custom selection frame 2021-05-14 11:21:59 +03:00
ef085ef7df Web: Files: enable favorites and recent settings 2021-05-14 11:08:57 +03:00
f4e8ddc33b Merge branch 'develop' into bugfix/fixed-header-loader 2021-05-14 10:45:15 +03:00
359ead6b85 Files: added RecentSection, FavoritesSection 2021-05-13 20:25:49 +03:00
75a603f439 Web: Files: removed useless code 2021-05-13 15:39:44 +03:00
acccdfbda5 Web: Files: fixed setSelectedFolder 2021-05-13 15:39:18 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
d5163fe61c Web: Files: fixed closing MediaViewer 2021-05-12 16:08:20 +03:00
5a06c56d15 Web: Files: fixed remove media files 2021-05-12 14:23:18 +03:00
72ed5e031c Web: Common: hide delete icon from MediaViewer for shared folder 2021-05-12 14:05:54 +03:00
9ea5a131e8 Web: Files: fixed MediaViewer crash 2021-05-12 11:55:34 +03:00
55b3d86dba Web: Files: Store: Added open location for favorite folder 2021-05-12 11:37:28 +03:00