pavelbannov 68483bc979 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Startup.cs		2020-11-13 16:03:17 +03:00
..
GroupModel.cs	x-www-form-urlencoded: first version	2020-11-06 12:03:49 +03:00
GroupWrapperFull.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
LinkAccountModel.cs	x-www-form-urlencoded: add models	2020-11-10 13:41:32 +03:00
MemberModel.cs	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +03:00
SetManagerModel.cs	x-www-form-urlencoded: first version	2020-11-06 12:03:49 +03:00
StartReassignModel.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
TerminateModel.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ThumbnailsDataWrapper.cs	Replaced NewtonsoftJson with System.Text.Json	2020-02-21 16:19:32 +03:00
ThumbnailsModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
TransferGroupMembersModel.cs	People: added group model	2019-09-20 13:43:13 +03:00
UpdateMembersModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
UploadPhotoModel.cs	fix	2020-08-27 17:01:37 +03:00