|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
|
b5a66444d7
|
Thirdparty: fix save
|
2020-11-20 12:24:17 +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 |
|
|
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 |
|
|
e6be6f5072
|
References updated
|
2020-10-16 10:27:44 +03:00 |
|
|
f69281a07d
|
References updated
|
2020-10-15 21:30:16 +03:00 |
|
|
788bddeb4f
|
Studio: fix
|
2020-10-13 15:26:54 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
beeeaf3c3d
|
fix
|
2020-10-12 20:43:31 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
SuhorukovAnton
|
c455419113
|
Telegram: fix Kafka
|
2020-09-25 14:13:43 +03:00 |
|
SuhorukovAnton
|
693e35ac57
|
add ASC.TelegramService
|
2020-09-24 17:30:27 +03:00 |
|
|
a35a79c96a
|
moved from release/11 4414f77b
|
2020-09-18 10:59:23 +03:00 |
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
Diana
|
7466aed406
|
choice between mysql and postgresql
|
2020-08-28 00:45:07 +03:00 |
|
maksim
|
95299daaf9
|
ASC.Data.Storage.Migration: adding listener and extension
|
2020-08-27 17:06:03 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
952e0f40c7
|
Settings: authservice api
|
2020-08-26 17:34:21 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|
|
0d6acd74fb
|
Files: fix thirdparty
|
2020-04-16 13:33:58 +03:00 |
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +03:00 |
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
785cc4c5a3
|
Files: DI
|
2020-02-13 18:12:27 +03:00 |
|
|
c0cc00bfbe
|
Files:DI
|
2020-02-13 15:19:25 +03:00 |
|
|
35eca0d863
|
Files: DI
|
2020-02-06 11:56:12 +03:00 |
|
|
ff84afb110
|
Merge branch 'master' into feature/elastic
# Conflicts:
# web/ASC.Web.Core/SetupInfo.cs
|
2020-02-05 11:43:03 +03:00 |
|
|
671b043b7e
|
Files: GoogleDriveApp
|
2020-02-03 16:31:42 +03:00 |
|
|
9ff06671c2
|
moved from hotfix/10.5.2
|
2020-01-21 16:40:01 +03:00 |
|
|
a8f8b63414
|
EF: removed old classes
|
2019-12-23 17:57:21 +03:00 |
|
|
2782d9f64c
|
Merge branch 'master' into feature/ef
# Conflicts:
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# common/ASC.VoipService/Dao/VoipDao.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2019-12-23 16:25:33 +03:00 |
|