8d088c30ce
remove internal methods
2023-05-26 13:45:41 +03:00
1412d17140
fix
2023-05-26 13:29:23 +03:00
813c25404f
Merge branch 'develop' into feature/optimization-ef
2023-05-25 18:25:11 +03:00
baf51890c7
add ProtectUsers in EditorController
2023-05-22 13:26:40 +03:00
8d7219c0e0
async refactoring
2023-05-19 14:42:02 +03:00
c3725e3099
DocsStore: remake update
2023-04-18 18:04:45 +05:00
d88fd2c2b2
fix merge
2023-04-10 23:20:16 +03:00
4dad1d6067
Merge branch 'develop' into feature/optimization-ef
2023-04-10 23:19:56 +03:00
df62b3862f
Merge branch 'release/v1.0.0' into develop
...
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
12f971b75e
Merge branch 'develop' into feature/optimization-ef
2023-04-10 15:11:20 +03:00
6ed8cebb5f
fix
2023-04-10 11:41:12 +03:00
a6869cce18
si-LK empty files
2023-04-07 19:23:00 +05:00
07d847fdd1
Merge branch 'develop' into feature/optimization-ef
2023-04-06 17:24:05 +03:00
a733c29c2b
Merge branch 'develop' into refactoring/generic-classes
2023-04-04 12:33:26 +03:00
e1b01e2d81
fix methods with task and without async
2023-03-28 13:13:13 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
410dd4f7d0
refactoring
2023-03-24 12:29:28 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
ebd4f7d17c
Merge branch 'develop' into refactoring/generic-classes
...
# Conflicts:
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.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/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Service/Startup.cs
2023-03-20 21:10:08 +03:00
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +03:00
4353f8f432
fix Bug 61186
2023-03-17 12:27:56 +03:00
603fc8cc0f
MessagesContext - async
2023-03-16 18:23:59 +03:00
393887f67b
FilesDbContext- async
2023-03-15 16:24:02 +03:00
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +03:00
1d87baec93
AccountLinkContext - async
2023-03-13 23:07:37 +03:00
Vashchuk Nikita
8bbdeffa46
changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName
2023-03-09 16:40:36 +05:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
e73df55f3c
Bug 61218
2023-03-01 20:32:44 +03:00
887926f852
fixed ChunkedUploader with external uploader url
2023-02-28 22:32:56 +03:00
d847ac0827
Merge branch 'develop' into refactoring/generic-classes
2023-02-27 15:41:40 +03:00
216a6480c8
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
2023-02-22 15:50:55 +03:00
1c3d3bf132
Merge branch 'develop' into feature/fix-webhooks-second
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
3269d48e15
added new table
2023-02-21 14:22:34 +03:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
5e9f12a797
backend: refactoring
2023-02-20 23:10:49 +03:00
25859e5d4e
refactoring
2023-02-17 15:56:40 +03:00
0476363100
Merge branch 'develop' into feature/entries-trash-origin
2023-02-10 12:45:26 +03:00
2e21ee42d5
Merge branch 'develop' into refactoring/generic-classes
2023-02-08 19:54:31 +03:00
6d363d4abd
Webhooks: settings
2023-02-08 14:46:33 +03:00
e58175f69e
WebHooks: added resources, new methods and settings for disable webhook
2023-02-08 14:17:06 +03:00
b63bfc4de5
Files: added filter by origin room
2023-02-07 19:18:32 +03:00
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
683b1ecd83
fix
2023-01-30 16:55:02 +03:00
d90b37252f
Merge branch 'develop' into refactoring/generic-classes
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
2023-01-26 23:00:02 +03:00
e2e73d7ced
Files: autocleanup
2023-01-26 20:44:53 +03:00
d4cb3327b7
SocketIO: updateFolder, deleteFolder
2023-01-25 14:50:46 +03:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
981a013455
refactoring files: remove Convert.ChangeType
2023-01-19 17:52:34 +03:00
