pavelbannov c89b8ca427 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs # common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs		2023-02-07 14:31:22 +03:00
..
files	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
groups	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
modules	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
oforms	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00
people	Fix Bug 60624 - Accounts. Alert Work in progress для Invite again, Time zone, Reset authentication	2023-01-24 12:18:56 +03:00
plugins	Web:Common:Api: add 'request' func to plugins api	2022-08-24 19:53:33 +03:00
portal	Fix Bug 60332 - Payments. Warning Request failed with status code 405	2022-12-26 14:01:34 +03:00
rooms	Web: Files: added cancel request	2022-12-26 16:58:45 +03:00
settings	Merge branch 'develop' into feature/fix-whitelable	2022-11-24 02:33:13 +05:00
user	Common: API: add login method	2022-12-09 10:40:38 +03:00
client.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00