Viktor Fomin 0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth ... # Conflicts: # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # web/ASC.Web.Client/src/components/pages/Confirm/index.js		2021-04-28 11:20:32 +03:00
..
ASC.Api.Core	Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-28 11:13:01 +03:00
ASC.Common	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
ASC.Core.Common	Tfa: validate confirm link	2021-04-16 21:54:53 +03:00
ASC.Data.Encryption	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
ASC.Data.Reassigns	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.Data.Storage	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.FederatedLogin	Thirdparty: fix providers	2021-04-26 21:42:39 +03:00
ASC.Feed	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.IPSecurity	MemoryCache -> IMemoryCache	2021-01-12 20:51:14 +03:00
ASC.MessagingSystem	MessagesRepository: fix	2021-01-12 10:27:48 +03:00
ASC.Notify.Textile	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.Resource.Manager	ResManager: added cshtml	2021-04-23 15:16:32 +03:00
ASC.Socket.IO	SocketIO: yarn.lock	2021-04-06 20:36:41 +03:00
ASC.Textile	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.Thumbnails	Thumb: security alert	2020-12-15 13:33:51 +03:00
ASC.UrlShortener	Added url shortener service	2020-03-05 14:45:34 +03:00
ASC.VoipService	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
services	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00