Commit Graph

982 Commits

Author SHA1 Message Date
18cc3d09c6 fix async 2023-03-21 17:28:06 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
dde9cac96e TelegramDbContext - async 2023-03-17 11:47:17 +03:00
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +03:00
e5749eb986 FirebaseDbContext - async 2023-03-15 16:39:41 +03:00
e4acd2776c FeedDbContext - async 2023-03-15 13:04:34 +03:00
e98784fd42 CustomDbContext - async 2023-03-15 12:22:30 +03:00
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
1d87baec93 AccountLinkContext - async 2023-03-13 23:07:37 +03:00
9a1404a401 BackupsContext - async 2023-03-13 19:29:42 +03:00
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
814f697047 Web.Api: refactor 2023-02-20 11:16:17 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +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
d49ee80fd8 Merge branch 'develop' into feature/fix-webhooks-second 2023-02-08 13:18:59 +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
Vashchuk Nikita
d8b9fada67 added functionality for disable SSL verification on WebhookSender requests 2023-01-31 00:25:51 +05:00
Vashchuk Nikita
cf37c1704d remove name from returned parameters 2023-01-30 21:31:31 +05:00
51d88c1e5a api/settings: return Standalone 2023-01-30 11:15:57 +03:00
dc71761710 Settings: TenantDomainValidator 2023-01-26 15:31:06 +03:00
Vashchuk Nikita
596a85a318 fix GetJournal 2023-01-24 13:40:26 +05:00
Vashchuk Nikita
592c672c34 added name to returned parameters 2023-01-24 12:03:57 +05:00
Vashchuk Nikita
de94226794 fix 2023-01-23 18:15:46 +05:00
Vashchuk Nikita
1c32151a77 Revert "fix create, update methods", added id to returned parameters 2023-01-23 16:53:03 +05:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
2023-01-19 22:00:57 +03:00
9937ecccee fix 2023-01-19 18:32:37 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
bff2128b5f Resources renamed 2023-01-18 18:53:09 +03:00
Vashchuk Nikita
bfe7524dde fix create, update methods 2023-01-18 11:24:44 +05:00
2f29eb444f fix 60163 2023-01-13 14:28:44 +03:00
92f786c572 fix 60163 2023-01-12 12:09:01 +03:00
a8bcc8e558 Payment: fix 2023-01-10 20:56:38 +03:00
5c828d4124 upload .ico for favicon 2022-12-27 13:49:07 +03:00
00b32e638a fix Bug 60214 2022-12-23 21:00:05 +03:00
a1daacb4d0 fix 2022-12-21 12:38:47 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
7e52c309c1 Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 15:13:43 +03:00
e8e75dfa8a
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
2022-12-09 13:16:21 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
ccfc8d0e47 Auth: added confirm data 2022-12-08 17:53:39 +03:00
0e6d5405d2 fix web.api tests 2022-12-07 13:38:35 +03:00