Tatiana Lopaeva aa6c02b190 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # packages/asc-web-common/api/settings/index.js # packages/asc-web-common/components/PrivateRoute/index.js # packages/asc-web-common/store/SettingsStore.js # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/ru/SelectFile.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/Shell.jsx		2021-09-20 16:26:34 +03:00
..
Caching	Kafka: fix	2021-08-13 17:05:11 +03:00
Collections	Optimization	2019-08-30 15:40:57 +03:00
Data	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
DependencyInjection	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
Geolocation	EF: GeolocationHelper	2019-12-13 16:05:24 +03:00
Logging	Nlog: optimization	2021-08-20 15:42:43 +03:00
Mapping	crm: refactoring. bugfix	2021-05-05 17:09:05 +03:00
Module	init commit	2019-05-15 17:56:09 +03:00
Notify	Optimization	2019-08-08 12:26:58 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
Security	Scope: refactoring	2020-10-19 18:53:15 +03:00
Threading	bug fix: DistributedTask.Exception clean up when OnCompleted	2021-06-16 17:24:48 +03:00
Utils	Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar	2021-07-27 12:43:01 +03:00
Web	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
ASC.Common.csproj	fixed run via vs	2021-08-23 15:55:19 +03:00
ASC.Common.sln	init commit	2019-05-15 17:56:09 +03:00
DIHelper.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00