Skip to content
This repository was archived by the owner on Oct 5, 2023. It is now read-only.

Conversation

@steveba14
Copy link

test

steveba14 and others added 30 commits July 2, 2011 14:40
Conflicts:
	CharityPortal/CharityPortal.Data/App.Config
	CharityPortal/CharityPortal.Data/CharityPortal.Data.csproj
	CharityPortal/CharityPortal.Data/DataContext.Designer.cs
	CharityPortal/CharityPortal.Data/DataContext.edmx
	CharityPortal/CharityPortal/CharityPortal.csproj
	CharityPortal/CharityPortal/Content/Site.css
	CharityPortal/CharityPortal/Views/Home/About.cshtml
	CharityPortal/CharityPortal/Views/Home/Index.cshtml
	CharityPortal/CharityPortal/Views/Shared/_Layout.cshtml
	CharityPortal/CharityPortal/Web.config
Conflicts:
	CharityPortal/CharityPortal/CharityPortal.csproj
	CharityPortal/CharityPortal/Views/Shared/_Layout.cshtml
Resource matcher doesn't reload old data on restart
ivanz and others added 9 commits July 3, 2011 14:57
- Add a map to Project to display its available and required resources
- Update the main menu Map ("Overview map") to display projects, available and required resources all together.
Conflicts:
	CharityPortal/CharityPortal.sln
	CharityPortal/CharityPortal/Views/Shared/_Layout.cshtml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants