Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

try to commit sarah #4

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

try to commit sarah #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de09419
try to commit sarah
Apr 10, 2017
d4cbaba
Merge remote-tracking branch 'refs/remotes/origin/master' into Alamee…
Apr 10, 2017
6c78873
Merge remote-tracking branch 'refs/remotes/origin/master'
Apr 10, 2017
523f823
.
Apr 10, 2017
941f917
Merge remote-tracking branch 'refs/remotes/origin/master' into Alamee…
Apr 10, 2017
597f7c3
All Class Model
Apr 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified AdminstrationSysytem-v1/.vs/AdminstrationSysytem-v1/v14/.suo
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion AdminstrationSysytem-v1/.vs/config/applicationhost.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</site>
<site name="AdminstrationSysytem-v1" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\apple\Documents\GitHub\ITI-AdminstrationSystem\AdminstrationSysytem-v1\AdminstrationSysytem-v1" />
<virtualDirectory path="/" physicalPath="C:\Users\Sarah\Documents\GitHub\ITI-AdminstrationSystem\AdminstrationSysytem-v1\AdminstrationSysytem-v1" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:65338:localhost" />
Expand Down
63 changes: 58 additions & 5 deletions AdminstrationSysytem-v1/AdminstrationSysytem-v1/AdminstrationSysytem-v1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,42 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Migrations\201704101443172_h1.cs" />
<Compile Include="Migrations\201704101443172_h1.Designer.cs">
<DependentUpon>201704101443172_h1.cs</DependentUpon>
<Compile Include="Migrations\201704101932076_h2.cs" />
<Compile Include="Migrations\201704101932076_h2.Designer.cs">
<DependentUpon>201704101932076_h2.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704101940151_h3.cs" />
<Compile Include="Migrations\201704101940151_h3.Designer.cs">
<DependentUpon>201704101940151_h3.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704101944230_h4.cs" />
<Compile Include="Migrations\201704101944230_h4.Designer.cs">
<DependentUpon>201704101944230_h4.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704102002565_h5.cs" />
<Compile Include="Migrations\201704102002565_h5.Designer.cs">
<DependentUpon>201704102002565_h5.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704102018298_h6.cs" />
<Compile Include="Migrations\201704102018298_h6.Designer.cs">
<DependentUpon>201704102018298_h6.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704102026037_h7.cs" />
<Compile Include="Migrations\201704102026037_h7.Designer.cs">
<DependentUpon>201704102026037_h7.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704102035520_h8.cs" />
<Compile Include="Migrations\201704102035520_h8.Designer.cs">
<DependentUpon>201704102035520_h8.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201704102042201_h9.cs" />
<Compile Include="Migrations\201704102042201_h9.Designer.cs">
<DependentUpon>201704102042201_h9.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Models\Attendance.cs" />
<Compile Include="Models\Course_Student_Exam.cs" />
<Compile Include="Models\Course_Student_Instructor.cs" />
<Compile Include="Models\Instructors.cs" />
<Compile Include="Models\Instructor_Corse_InDepartment.cs" />
<Compile Include="Models\QuestionAnswers.cs" />
Expand All @@ -218,6 +249,7 @@
<Compile Include="Models\Qualifications.cs" />
<Compile Include="Models\Questions.cs" />
<Compile Include="Models\Student.cs" />
<Compile Include="Models\Vacation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Startup.cs" />
</ItemGroup>
Expand Down Expand Up @@ -292,8 +324,29 @@
<Content Include="Scripts\jquery-1.10.2.min.map" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\201704101443172_h1.resx">
<DependentUpon>201704101443172_h1.cs</DependentUpon>
<EmbeddedResource Include="Migrations\201704101932076_h2.resx">
<DependentUpon>201704101932076_h2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704101940151_h3.resx">
<DependentUpon>201704101940151_h3.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704101944230_h4.resx">
<DependentUpon>201704101944230_h4.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704102002565_h5.resx">
<DependentUpon>201704102002565_h5.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704102018298_h6.resx">
<DependentUpon>201704102018298_h6.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704102026037_h7.resx">
<DependentUpon>201704102026037_h7.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704102035520_h8.resx">
<DependentUpon>201704102035520_h8.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201704102042201_h9.resx">
<DependentUpon>201704102042201_h9.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<PropertyGroup>
Expand Down
243 changes: 0 additions & 243 deletions AdminstrationSysytem-v1/AdminstrationSysytem-v1/Migrations/201704101443172_h1.cs
View file
Open in desktop

This file was deleted.

Loading