ADAM / AIAHTML5

Commit add82cea8dce3533d837d3a59b04562450310960

Authored by Nikita Kulshreshtha
2 parents a31510ff d6e0fc74

Merge branch 'DAMultipleViewOpen' of http://52.6.196.163/ADAM/AIAHTML5 into DAMultipleViewOpen

Inline Side-by-side
Showing 5 changed files with 30 additions and 31 deletions
.gitignore
  View file @add82ce
1 -# git ignore file  
2 -[Bb]in/  
3 -[Dd]ebug*/  
4 -*.lib  
5 -Thumbs.db  
6 -obj/  
7 -*.obj  
8 -*.exe  
9 -*.pdb  
10 -*.user  
11 -*.aps  
12 -*.pch  
13 -*.vspscc  
14 -*_i.c  
15 -*_p.c  
16 -*.ncb  
17 -*.suo  
18 -*.sln.docstates  
19 -*.tlb  
20 -*.tlh  
21 -*.bak  
22 -*.cache  
23 -*.ilk 1 +# git ignore file
  2 +[Bb]in/
  3 +[Dd]ebug*/
  4 +*.lib
  5 +Thumbs.db
  6 +obj/
  7 +*.obj
  8 +*.exe
  9 +*.pdb
  10 +*.user
  11 +*.aps
  12 +*.pch
  13 +*.vspscc
  14 +*_i.c
  15 +*_p.c
  16 +*.ncb
  17 +*.suo
  18 +*.sln.docstates
  19 +*.tlb
  20 +*.tlh
  21 +*.bak
  22 +*.cache
  23 +*.ilk
24 *.log 24 *.log
25 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj 25 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
26 -400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user  
27 \ No newline at end of file 26 \ No newline at end of file
  27 +400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
400-SOURCECODE/AIAHTML5.API/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted
View file @a31510f
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @add82ce
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> 11 <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
12 <OutputType>Library</OutputType> 12 <OutputType>Library</OutputType>
13 <AppDesignerFolder>Properties</AppDesignerFolder> 13 <AppDesignerFolder>Properties</AppDesignerFolder>
14 - <RootNamespace>eLearningPlayer</RootNamespace>  
15 - <AssemblyName>eLearningPlayer</AssemblyName> 14 + <RootNamespace>AIA</RootNamespace>
  15 + <AssemblyName>AIA</AssemblyName>
16 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 16 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17 <UseIISExpress>false</UseIISExpress> 17 <UseIISExpress>false</UseIISExpress>
18 <IISExpressSSLPort /> 18 <IISExpressSSLPort />
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
  View file @add82ce
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 - <ProjectView>ProjectFiles</ProjectView> 4 + <ProjectView>ShowAllFiles</ProjectView>
5 </PropertyGroup> 5 </PropertyGroup>
6 <ProjectExtensions> 6 <ProjectExtensions>
7 <VisualStudio> 7 <VisualStudio>
400-SOURCECODE/AIAHTML5.Web/Web.config
  View file @add82ce
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" /> 27 <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
28 <add input="{REQUEST_URI}" pattern="^/(api)" negate="true" /> 28 <add input="{REQUEST_URI}" pattern="^/(api)" negate="true" />
29 </conditions> 29 </conditions>
30 - <action type="Rewrite" url="/index.html" /> 30 + <action type="Rewrite" url="/AIA/" />
31 </rule> 31 </rule>
32 </rules> 32 </rules>
33 </rewrite> 33 </rewrite>
@@ -38,15 +38,14 @@ @@ -38,15 +38,14 @@
38 <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> 38 <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
39 <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" /> 39 <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
40 <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" /> 40 <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
  41 + <mimeMap fileExtension=".json" mimeType="application/json" />
41 </staticContent> 42 </staticContent>
42 <defaultDocument enabled="true"> 43 <defaultDocument enabled="true">
43 <files> 44 <files>
44 <clear /> 45 <clear />
45 - <add value="Default.htm" /> 46 + <add value="index.html" />
46 <add value="login.html" /> 47 <add value="login.html" />
47 <add value="Default.asp" /> 48 <add value="Default.asp" />
48 - <add value="index.htm" />  
49 - <add value="index.html" />  
50 <add value="iisstart.htm" /> 49 <add value="iisstart.htm" />
51 <add value="default.aspx" /> 50 <add value="default.aspx" />
52 </files> 51 </files>