Tatiana Lopaeva 40d56075f1 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.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.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js		2022-02-07 12:40:50 +03:00
..
ASC.Api.Core	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
ASC.Common	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
ASC.Core.Common	Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop	2022-02-04 21:00:05 +03:00
ASC.Data.Backup.Core	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
ASC.Data.Encryption	Merge branch 'develop' into feature/net6	2021-10-22 16:10:37 +03:00
ASC.Data.Reassigns	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
ASC.Data.Storage	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
ASC.FederatedLogin	Packages updated	2022-02-02 19:54:23 +03:00
ASC.Feed	net6	2021-08-25 18:26:13 +03:00
ASC.IPSecurity	Packages updated	2022-02-02 19:54:23 +03:00
ASC.MessagingSystem	Packages updated	2022-02-02 19:54:23 +03:00
ASC.Notify.Textile	net6	2021-08-25 18:26:13 +03:00
ASC.Resource.Manager	ResManager: fix	2021-09-17 16:46:24 +03:00
ASC.Socket.IO	Bump redis from 2.8.0 to 3.1.1 in /common/ASC.Socket.IO	2021-04-27 18:30:56 +00:00
ASC.SsoAuth	SsoAuth: 2e37dcd0	2021-05-31 11:35:42 +03:00
ASC.Textile	net6	2021-08-25 18:26:13 +03:00
ASC.Thumbnails	fix warning	2021-10-27 12:33:39 +03:00
ASC.UrlShortener	Added url shortener service	2020-03-05 14:45:34 +03:00
ASC.VoipService	Packages updated	2022-02-02 19:54:23 +03:00
ASC.Webhooks.Core	Packages updated	2022-02-02 19:54:23 +03:00
services	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
Tests	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Tools/AutoMigrationCreator	AutoMigrationCreator: add new ef core dependencies	2021-11-30 13:32:16 +03:00