Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ts merge

Browse Source
This commit is contained in:
Paolo Possanzini
2017-12-07 10:06:32 +01:00
parent 512a2200c6
commit d8623cc2bc
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Client.csproj
+1 -1
View File
@@ -33,7 +33,7 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Step.Model/Step.Model.csproj
+2
View File
@@ -11,6 +11,8 @@
<AssemblyName>Step.Model</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Step/Step.csproj
+1 -1
View File
@@ -18,7 +18,7 @@
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Step/wwwroot/src/modules/login.ts
+1 -1
View File
@@ -9,7 +9,7 @@ import { LoginService } from "../app.modules";
@Component({ name: "login", components: { modal: Modal } })
export default class Login extends Vue {
public user: server.loginViewModel = { password: null, username: null };
public user: server.loginViewModel = { password: null, username: null};
public hasError: boolean = false;
public isVisible: boolean = true;
Step/wwwroot/src/modules/login.vue
+1 -1
View File
@@ -15,7 +15,7 @@
<small class="error" v-if="hasError" >Password errata</small>
</div>
<button class="btn btn-success block block-center" @click="doLogin()">Log in</button>
<button class="btn btn-success block block-center" @click="doLogin()">Log in ss</button>
</div>
</div>
</modal>