IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,755 Commits 40 Branches 22 Tags 420 MiB
675590854c
Commit Graph

245 Commits

Author SHA1 Message Date
pavelbannov
2283184a61 removed Serializable attribute 2023-09-08 16:24:24 +03:00
Sergey Linnik
675755aedd Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop 2023-09-08 09:46:59 +03:00
Andrei Panov
569330129b move api redirect uri from login provider 2023-09-06 10:13:46 +03:00
Alexey Safronov
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
Anton Sukhorukov
f6ca59874d zoom: add keys and add in AuthProviders 2023-09-04 14:46:48 +03:00
Eloncase
65fa314059 apisystem: zoom: handle store link 
# Conflicts:
#	common/services/ASC.ApiSystem/Controllers/ZoomController.cs
 2023-08-29 14:04:40 +03:00
Eloncase
771b07b81b ApiSystem: redirect if user and portal exists 
# Conflicts:
#	common/services/ASC.ApiSystem/Controllers/ZoomController.cs
 2023-08-29 14:00:42 +03:00
Eloncase
86eaf2dd8d FederatedLogin: zoom login provider 2023-08-29 14:00:31 +03:00
Alexey Bannov
32fc662a85 backend: updated some dll 2023-08-10 19:16:25 +03:00
Alexey Bannov
e427f70709 backend: updated some dll 2023-08-08 19:43:14 +03:00
Sergey Linnik
b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
 2023-08-01 17:07:05 +03:00
Sergey Linnik
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
 2023-08-01 11:39:57 +03:00
pavelbannov
c4692c0e69 fixed query 2023-06-28 20:17:22 +03:00
pavelbannov
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries 
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
 2023-06-27 18:29:23 +03:00
Anton Sukhorukov
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
Anton Sukhorukov
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
Anton Sukhorukov
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
Anton Sukhorukov
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
pavelbannov
6c78438b75 Merge branch 'develop' into feature/optimization-ef 
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
 2023-05-30 14:13:02 +03:00
Anton Sukhorukov
2a15974880 CompileAsyncQuery: AccountLinker 2023-05-25 10:58:09 +03:00
Alexey Bannov
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header"" 
This reverts commit 39c1824162.
 2023-05-10 13:07:24 +03:00
Alexey Bannov
39c1824162 Revert "backend: removed X-REWRITER-URL header" 
This reverts commit 93ec325611.
 2023-04-27 22:35:00 +03:00
Alexey Bannov
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
Natalia
50c3f5805a fixes for api docs 2023-04-13 12:43:54 +03:00
SuhorukovAnton
6309d9530c fix async 2023-03-30 15:11:45 +03:00
Sergey Linnik
ff8721a4b1 Hide documentation warnings (4dfeea2969) 2023-03-29 20:29:53 +05:00
Sergey Linnik
aa1b712131 Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
 2023-03-29 19:28:15 +05:00
Sergey Linnik
4dfeea2969 Hide documentation warnings 2023-03-29 19:25:28 +05:00
SuhorukovAnton
e1b01e2d81 fix methods with task and without async 2023-03-28 13:13:13 +03:00
SuhorukovAnton
aac1896a0f remove CreateDbContextAsync and fix ExecuteAsync 2023-03-28 00:25:55 +03:00
SuhorukovAnton
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
SuhorukovAnton
1d87baec93 AccountLinkContext - async 2023-03-13 23:07:37 +03:00
Alexey Bannov
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
Alexey Bannov
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +03:00
Alexey Bannov
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
Alexey Bannov
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
pavelbannov
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
Alexey Bannov
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
pavelbannov
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
SuhorukovAnton
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
SuhorukovAnton
fabb3ceac5 remove waste asc.federatedLogin 2022-09-07 18:36:52 +03:00
MaksimChegulov
d426b2f5d2 FederatedLogin: deleted unnecessary 2022-08-30 13:08:55 +03:00
MaksimChegulov
15f5b67008 FederationLogin: refactor 2022-08-29 22:08:55 +03:00
MaksimChegulov
834a52707f FederatedLogin: fix 2022-08-25 18:31:07 +03:00
MaksimChegulov
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
MaksimChegulov
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
MaksimChegulov
9b22d27306 Files: added keys check 2022-08-25 11:55:54 +03:00
pavelbannov
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00