Commit Graph

60 Commits

Author SHA1 Message Date
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
424c6a6806 migrate base mapper class from ASC.CRM to ASC.Common 2021-04-30 17:52:57 +03:00
560d803d86 Common: added assembly version 2021-04-09 11:12:10 +03:00
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
f222f4be0c .net 5 2021-01-22 16:42:26 +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
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +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
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +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
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
f9dc19526c Added sendjoininvite, sendadmmail 2020-07-24 17:01:20 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
7a9b02abdb TreatWarningsAsErrors=false 2020-02-03 14:27:41 +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
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
f0f6b0a299 EF: resourceManager 2019-12-16 12:30:01 +03:00
08c98691d5 EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
65563552fa Packages updated 2019-08-15 14:33:57 +03:00
d524663958 Packages updated 2019-08-12 15:52:09 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
00120d88c9 Notify: sender queue moved to ASC.Studio.Notify 2019-08-02 13:25:33 +03:00
969a605ad1 Upgrade references 2019-07-24 15:33:14 +03:00