|
e6389ebd5e
|
refactoring: add globalUsings: FederatedLogin
|
2022-01-26 15:34:57 +03:00 |
|
|
445f03097d
|
Fix content-type header
|
2022-01-24 22:44:18 +03:00 |
|
|
efb51c613f
|
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
|
2022-01-11 19:28:48 +03:00 |
|
|
6d250efffa
|
add *.dll for support redis + update Grpc.* dll
|
2021-12-23 16:17:31 +03:00 |
|
|
fb3bfba1bd
|
Files: optimization
|
2021-12-16 15:49:35 +03:00 |
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
8ca88e4620
|
Merge branch 'develop' into feature/net6
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/ASC.Common.csproj
# products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
|
2021-11-23 16:40:50 +03:00 |
|
|
1bc93172d3
|
OAuth: fix
|
2021-11-02 20:39:30 +03:00 |
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
9dd28a144d
|
Web: Fixed callback pages, added login callback for desktop client
|
2021-10-19 10:31:34 +03:00 |
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
66d126410c
|
Login: added desktop param
|
2021-10-13 10:25:19 +03:00 |
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
e755d2eda8
|
renamed providers to lowercase
|
2021-09-24 17:36:46 +03:00 |
|
|
b791586252
|
net6
|
2021-08-25 18:26:13 +03:00 |
|
|
e5faa90adb
|
removed nuget warnings
|
2021-08-20 16:53:27 +03:00 |
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
0dbadc6394
|
from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects
|
2021-04-30 18:42:10 +03:00 |
|
|
8bb173fa92
|
Thirdparty: fix providers
|
2021-04-26 21:42:39 +03:00 |
|
|
5f2998af87
|
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
|
2021-04-16 19:33:26 +03:00 |
|
|
18a2c0a53d
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
|
2021-03-25 21:50:09 +03:00 |
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|
|
24d0b0e672
|
Thridparty: fixed RemoveProvider method
|
2021-02-19 12:11:04 +03:00 |
|
|
38b62a9a95
|
FederatedLogin: added EmbeddedResource callback.htm
|
2021-02-16 19:48:51 +03:00 |
|
|
a12cf74638
|
fixed login handler
|
2021-02-10 22:43:18 +03:00 |
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
|
b8e40ff3b2
|
OAuth: fix links
|
2021-01-13 16:30:32 +03:00 |
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
|
1675896294
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
|
2020-12-04 11:59:10 +03:00 |
|
|
462bd090d1
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-26 08:22:40 +03:00 |
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
Ilya Oleshko
|
92bcdb9f8b
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 13:09:13 +03:00 |
|
|
b5a66444d7
|
Thirdparty: fix save
|
2020-11-20 12:24:17 +03:00 |
|
|
c666520c74
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-17 12:04:33 +03:00 |
|
|
75fce656f0
|
Merge branch 'develop' into feature/dotnet5
|
2020-11-17 11:31:14 +03:00 |
|
|
a66f99f574
|
net5.0
|
2020-11-15 18:55:57 +03:00 |
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
|
44536c695a
|
Thirdparty: fix.
|
2020-11-12 11:24:36 +03:00 |
|
|
503d2c1948
|
fix loginproviders
|
2020-11-11 15:21:15 +03:00 |
|
|
09c07e5060
|
Api: ThirdPartyController
|
2020-11-11 12:11:44 +03:00 |
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
|
e01182be70
|
Added /api/2.0/capabilities.json
|
2020-10-31 17:11:45 +03:00 |
|
|
367c93fd91
|
Refactoring: scope
|
2020-10-22 20:57:18 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +03:00 |
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|