Skip to content
Open

test #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e0231bf
adding employee table
extofer Oct 27, 2012
f7aa231
changed donations table
extofer Oct 27, 2012
2f08649
Merge branch 'master' of https://github.com/extofer/bearcamp
extofer Oct 27, 2012
7f75819
added emps tables, controller and views
extofer Oct 27, 2012
68bcf2d
duh
extofer Oct 27, 2012
bbe21d7
Merge pull request #4 from extofer/emps-crud
extofer Oct 27, 2012
52d8835
added new t4 template to fix validation issues. This is a beta templa…
anthem001 Oct 27, 2012
e98205b
added new t4 template to fix validation issues. This is a beta templa…
anthem001 Oct 27, 2012
a792c77
Merge pull request #6 from extofer/fixingvalidator
anthem001 Oct 27, 2012
0d3e5dc
removed spacing of content
anthem001 Oct 27, 2012
7898f8e
added spacing to teddy logo
anthem001 Oct 27, 2012
a4f7c37
removed obj folder
extofer Oct 27, 2012
bf94041
Merge pull request #8 from extofer/update-gitignore
extofer Oct 27, 2012
70a52b6
removed bins and updated .gitignore
extofer Oct 27, 2012
ff27a59
fixed jquery pathing
anthem001 Oct 27, 2012
b933f9c
Merge pull request #9 from extofer/remove-bins
extofer Oct 27, 2012
94ca2c0
removed 'view' on donor since already viewing
anthem001 Oct 27, 2012
f15851e
cleanup on donors create page
anthem001 Oct 27, 2012
0455fb3
merging
anthem001 Oct 27, 2012
c8a08f2
added back the web.config DELETED by Gabe
anthem001 Oct 28, 2012
2f8cd7b
Merge pull request #11 from extofer/prettyvalidation
anthem001 Oct 28, 2012
d21ef79
better error messages for donor validation
anthem001 Oct 28, 2012
bf2c6a0
slight change on error
anthem001 Oct 28, 2012
8fe77de
quick format to show erik
anthem001 Oct 28, 2012
47b6606
Merge pull request #12 from extofer/prettyvalidation
anthem001 Oct 28, 2012
780483b
fixing user styles
anthem001 Oct 28, 2012
1c5e1ba
finished cleaning up users
anthem001 Oct 28, 2012
ac22705
think I have all the styles fixed for all menu items
anthem001 Oct 28, 2012
a6acb2b
added dropdown menus
anthem001 Oct 28, 2012
21003ca
Merge pull request #14 from extofer/prettyvalidation
anthem001 Oct 28, 2012
5f7b391
integrated logo to navbar
anthem001 Oct 28, 2012
d82e2e1
added background and new style
anthem001 Oct 28, 2012
e0e1a9c
Merge pull request #15 from extofer/prettyvalidation
anthem001 Oct 28, 2012
6738c95
edited gitignore to include Web.Debug and Release configs to ignore list
extofer Oct 28, 2012
ee1b12d
removed donation type from export method or donations
extofer Oct 28, 2012
a68cfc4
Merge pull request #16 from extofer/export-bug
extofer Oct 28, 2012
d9a7142
deleted tests. unfortunately not using
anthem001 Nov 11, 2012
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,6 @@ _ReSharper*/
[Tt]est[Rr]esult*
app/BearCamp/BearCamp/bin/
app/BearCamp/BearCamp/obj/
app/BearCamp/BearCamp/web.object
app/BearCamp/BearCamp/Web.config
app/BearCamp/BearCamp/Web.Debug.config
app/BearCamp/BearCamp/Web.Release.config
16 changes: 0 additions & 16 deletions app/BearCamp/BearCamp.Tests/AccountControllerTest.cs

This file was deleted.

24 changes: 0 additions & 24 deletions app/BearCamp/BearCamp.Tests/App.config

This file was deleted.

87 changes: 0 additions & 87 deletions app/BearCamp/BearCamp.Tests/BearCamp.Tests.csproj

This file was deleted.

25 changes: 0 additions & 25 deletions app/BearCamp/BearCamp.Tests/Controllers/HomeControllerTest.cs

This file was deleted.

34 changes: 0 additions & 34 deletions app/BearCamp/BearCamp.Tests/Properties/AssemblyInfo.cs

This file was deleted.

Binary file not shown.
4 changes: 0 additions & 4 deletions app/BearCamp/BearCamp.Tests/packages.config

This file was deleted.

Binary file modified app/BearCamp/BearCamp.suo
Binary file not shown.
12 changes: 11 additions & 1 deletion app/BearCamp/BearCamp/BearCamp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,14 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\images\bearsmall.png" />
<Content Include="Content\images\otis_redding.png" />
<Content Include="favicon.ico" />
<Content Include="Content\bootstrap-responsive.css" />
<Content Include="Content\bootstrap-responsive.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<None Include="Content\bootstrap.min.css1" />
<Content Include="Content\images\add.png" />
<Content Include="Content\images\apple-touch-icon-114x114-precomposed.png" />
<Content Include="Content\images\apple-touch-icon-57x57-precomposed.png" />
Expand Down Expand Up @@ -284,6 +286,14 @@
<ItemGroup>
<Content Include="Views\FundraiserTasks\Delete.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
4 changes: 3 additions & 1 deletion app/BearCamp/BearCamp/Content/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -3693,12 +3693,14 @@ input[type="submit"].btn.btn-mini {
border-radius: 0 0 6px 6px;
}



.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
background-color: #F2DEDE;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
Expand Down
882 changes: 873 additions & 9 deletions app/BearCamp/BearCamp/Content/bootstrap.min.css

Large diffs are not rendered by default.

Loading