IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7f095f03d1
DocSpace-client/web/ASC.Web.Api/Models
History
AlexeySafronov 7f095f03d1 Merge branch 'master' into feature/Wizard 
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
..
Smtp Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
AuthModel.cs Api: added AuthenticationController 2019-05-28 12:40:37 +03:00
BuildVersion.cs Merge branch 'master' into feature/system-json 2020-05-07 10:28:20 +03:00
GreetingSettingsModel.cs Web.Client/Server: Settings: added changing greetingTitle 2019-11-05 16:15:47 +03:00
IpRestrictionsModel.cs Code Cleanup 2019-08-15 15:04:42 +03:00
QuotaWrapper.cs Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
SchemaModel.cs Settings: added customschemas 2020-01-20 18:29:30 +03:00
SecurityModel.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
SecurityWrapper.cs Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
SettingsModel.cs Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
SettingsWrapper.cs Wizard: api 2020-07-02 17:11:59 +03:00
StatisticsWrapper.cs Fix License 2020-07-08 18:30:23 +03:00
StorageModel.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
StorageWrapper.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
TenantVersionWrapper.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
TfaModel.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
TimezonesModel.cs Web.Api: SettingsController: added new model for timezones, changed api method 2019-10-30 14:33:27 +03:00
WebItemSecurityModel.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
WhiteLabelModel.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
WizardModel.cs Wizard: api 2020-07-02 17:11:59 +03:00