Commit Graph

19 Commits

Author SHA1 Message Date
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +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
SuhorukovAnton
c94b0ee340 connect-controlPanel: fix branding, backup and restore 2020-10-28 16:21:24 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +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
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
b426004f70 IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
531763fa1c Added ASC.Web.Core 2019-06-07 11:59:07 +03:00