Skip to content

Commit

Permalink
squash merge admin-forms-1.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robotdan committed Oct 20, 2020
1 parent 23c7133 commit ee33644
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.savant
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
savantVersion = "1.0.0"

project(group: "io.fusionauth", name: "fusionauth-netcore-client", version: "1.21.0", licenses: ["ApacheV2_0"]) {
project(group: "io.fusionauth", name: "fusionauth-netcore-client", version: "1.20.0", licenses: ["ApacheV2_0"]) {
workflow {
standard()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace></RootNamespace>
<PackageVersion>1.21.0</PackageVersion>
<PackageVersion>1.20.0</PackageVersion>
<AssemblyName>FusionAuth.Client.Test</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class Application {

public ApplicationEmailConfiguration emailConfiguration;

public ApplicationFormConfiguration formConfiguration;

public Guid? id;

public DateTimeOffset? insertInstant;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (c) 2018, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/


using System.Collections.Generic;
using System;

namespace io.fusionauth.domain {

/**
* @author Daniel DeGroff
*/
public class ApplicationFormConfiguration {

public Guid? adminRegistrationFormId;

public ApplicationFormConfiguration with(Action<ApplicationFormConfiguration> action) {
action(this);
return this;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public class Tenant {

public FamilyConfiguration familyConfiguration;

public TenantFormConfiguration formConfiguration;

public int? httpSessionMaxInactiveInterval;

public Guid? id;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (c) 2018, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/


using System.Collections.Generic;
using System;

namespace io.fusionauth.domain {

/**
* @author Daniel DeGroff
*/
public class TenantFormConfiguration {

public Guid? adminUserFormId;

public TenantFormConfiguration with(Action<TenantFormConfiguration> action) {
action(this);
return this;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ namespace io.fusionauth.domain.form {
* @author Daniel DeGroff
*/
public enum FormType {
registration
registration,
adminRegistration,
adminUser
}
}
2 changes: 1 addition & 1 deletion fusionauth-netcore-client/fusionauth-netcore-client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace></RootNamespace>
<PackageVersion>1.21.0</PackageVersion>
<PackageVersion>1.20.0</PackageVersion>
<Title>FusionAuth .net Standard Client</Title>
<AssemblyName>FusionAuth.Client</AssemblyName>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down

0 comments on commit ee33644

Please sign in to comment.