pavelbannov a085e8ef38 Merge branch 'master' into feature/release-11.0.0 ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Utility/TenantExtra.cs		2020-09-23 14:00:24 +03:00
..
Contracts	Removed unused proto, added backup rewrite	2020-06-25 19:05:14 +03:00
Controllers	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +03:00
Core	scope: refactoring	2020-09-07 15:01:15 +03:00
EF	fix	2020-08-27 17:01:37 +03:00
Exceptions	fix	2020-08-27 17:01:37 +03:00
Extensions	fix	2020-08-27 17:01:37 +03:00
Listerners	encryption: add api-metods getProgress and getSettings	2020-09-18 13:02:20 +03:00
ModelApi	fix	2020-08-27 17:01:37 +03:00
Properties	Backup: refactoring	2020-06-03 12:15:05 +03:00
protos	encryption: add api start	2020-09-17 16:56:12 +03:00
Service	Merge branch 'master' into feature/release-11.0.0	2020-09-23 14:00:24 +03:00
Storage	fix	2020-08-27 17:01:37 +03:00
Tasks	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
Utils	fix	2020-08-27 17:01:37 +03:00
ActionInvoker.cs	Backup: ajaxpro removed	2020-06-15 11:19:40 +03:00
appsettings.json	Backup: refactoring	2020-06-03 12:15:05 +03:00
ASC.Data.Backup.csproj	encryption: add api start	2020-09-17 16:56:12 +03:00
BackupAjaxHandler.cs	DI: refactoring	2020-07-17 13:52:28 +03:00
BackupServiceLauncher.cs	encryption: add api-metods getProgress and getSettings	2020-09-18 13:02:20 +03:00
Program.cs	fix	2020-07-16 16:02:21 +03:00
Startup.cs	BaseStartup: refactoring	2020-07-15 15:33:44 +03:00