|
e5faa90adb
|
removed nuget warnings
|
2021-08-20 16:53:27 +03:00 |
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
87b7e171de
|
ApiSystem: fix
|
2021-08-11 21:32:43 +03:00 |
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
|
912501a2f4
|
Healthcheck: fix apisystem
|
2021-06-22 19:09:24 +03:00 |
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
|
90c67cac13
|
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
|
2021-05-24 13:26:13 +03:00 |
|
|
2d8b085d02
|
add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
|
2021-04-23 16:54:39 +03:00 |
|
|
5f2998af87
|
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
|
2021-04-16 19:33:26 +03:00 |
|
|
3aae413e12
|
replace Path.Combine to CrossPlatform.PathCombine
|
2021-04-16 16:26: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 |
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +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 |
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +03:00 |
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
40546da35d
|
fix create file
|
2020-11-26 20:30:57 +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 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +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 |
|
|
450184f51c
|
Merge branch 'develop' into feature/connect-controlPanel
|
2020-11-03 11:48:52 +03:00 |
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
|
43beaf6f6b
|
Refactoring: scope
|
2020-10-29 17:30:08 +03:00 |
|
|
049e8f63e9
|
Refactoring: scope.
|
2020-10-29 11:13:51 +03:00 |
|
|
af99020de0
|
Scope: refactoring. Encryption
|
2020-10-26 17:23:23 +03:00 |
|
SuhorukovAnton
|
03ae9171b6
|
connect-controlPanel: fix multitenancy
|
2020-10-23 10:42:28 +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 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +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 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
feba6bb1c0
|
ApiSystem: System.Text.Json
|
2020-07-09 11:08:42 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|