Commit Graph

19 Commits

Author SHA1 Message Date
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
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
035a98b878 Refactoring: scope. Backup 2020-10-26 16:38:21 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +03:00
197f468bf7 Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
SuhorukovAnton
1796c682a4 Backup: add backup.json and BackupSettings.cs, fix BackupWorker 2020-06-01 13:33:39 +03:00
0ff1f8249d Backup: refactoring 2020-05-29 17:50:39 +03:00
SuhorukovAnton
65739dac46 Backup: fix Startup 2020-05-28 16:37:36 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00