Merge remote-tracking branch 'origin/master'
# Conflicts: # FWA_MAIN/FWA_MAIN.csproj
This commit is contained in:
commit
f3b64d2c9e
@ -1,21 +1,20 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0"?>
|
||||||
<!--
|
<!--
|
||||||
For more information on how to configure your ASP.NET application, please visit
|
For more information on how to configure your ASP.NET application, please visit
|
||||||
https://go.microsoft.com/fwlink/?LinkId=301880
|
https://go.microsoft.com/fwlink/?LinkId=301880
|
||||||
-->
|
-->
|
||||||
<configuration>
|
<configuration>
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<defaultDocument>
|
<defaultDocument>
|
||||||
<files>
|
<files>
|
||||||
<clear />
|
<clear/>
|
||||||
<add value="Default.aspx" /> <!-- Or your specific default page -->
|
<add value="Default.aspx"/>
|
||||||
</files>
|
<!-- Or your specific default page -->
|
||||||
</defaultDocument>
|
</files>
|
||||||
</system.webServer>
|
</defaultDocument>
|
||||||
|
</system.webServer>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="ConnString"
|
<add name="ConnString" connectionString="Server=sql.eggtech.net;Database=College2;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;" providerName="System.Data.SqlClient"/>
|
||||||
connectionString="Server=sql.eggtech.net;Database=College2;User Id=admin;Password=delirium-purveyor-overall-backboned-approval-amino;"
|
|
||||||
providerName="System.Data.SqlClient" />
|
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="webpages:Version" value="3.0.0.0"/>
|
<add key="webpages:Version" value="3.0.0.0"/>
|
||||||
@ -23,10 +22,17 @@
|
|||||||
<add key="ClientValidationEnabled" value="true"/>
|
<add key="ClientValidationEnabled" value="true"/>
|
||||||
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
|
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
|
||||||
</appSettings>
|
</appSettings>
|
||||||
|
<!--
|
||||||
|
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
|
||||||
|
|
||||||
|
The following attributes can be set on the <httpRuntime> tag.
|
||||||
|
<system.Web>
|
||||||
|
<httpRuntime targetFramework="4.8" />
|
||||||
|
</system.Web>
|
||||||
|
-->
|
||||||
<system.web>
|
<system.web>
|
||||||
<compilation debug="true" targetFramework="4.8.1"/>
|
<compilation debug="true" targetFramework="4.8"/>
|
||||||
<httpRuntime targetFramework="4.8.1"/>
|
<httpRuntime targetFramework="4.8"/>
|
||||||
</system.web>
|
</system.web>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
@ -62,12 +68,8 @@
|
|||||||
</runtime>
|
</runtime>
|
||||||
<system.codedom>
|
<system.codedom>
|
||||||
<compilers>
|
<compilers>
|
||||||
<compiler language="c#;cs;csharp" extension=".cs"
|
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
|
||||||
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
||||||
warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
|
|
||||||
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
|
|
||||||
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
|
||||||
warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
|
|
||||||
</compilers>
|
</compilers>
|
||||||
</system.codedom>
|
</system.codedom>
|
||||||
</configuration>
|
</configuration>
|
Binary file not shown.
@ -3,7 +3,7 @@
|
|||||||
<asp:Content runat="server" ContentPlaceHolderID="cph1">
|
<asp:Content runat="server" ContentPlaceHolderID="cph1">
|
||||||
|
|
||||||
<link type="text/css" href="main.css"/>
|
<link type="text/css" href="main.css"/>
|
||||||
|
//Test
|
||||||
<h1 style="text-align: center; font-size: 44px">
|
<h1 style="text-align: center; font-size: 44px">
|
||||||
Patients
|
Patients
|
||||||
</h1>
|
</h1>
|
||||||
|
14
FWA_MAIN/patient.aspx.designer.cs
generated
14
FWA_MAIN/patient.aspx.designer.cs
generated
@ -58,19 +58,5 @@ namespace FWA_MAIN
|
|||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.WebControls.GridView gvPatient;
|
protected global::System.Web.UI.WebControls.GridView gvPatient;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Master property.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// Auto-generated property.
|
|
||||||
/// </remarks>
|
|
||||||
public new FWA_MAIN.main Master
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return ((FWA_MAIN.main)(base.Master));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user