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

test #1

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open

test #1

wants to merge 39 commits into from

Conversation

steveba14
Copy link

test

steveba14 and others added 30 commits July 2, 2011 14:40
@steveba14
testing
f9bda4c
@steveba14
Merge branch 'master' of github.com:steveba14/dev4good
3499312
@ivanz
Solution import with first-pass Data Model.
0acfe7c
@ivanz
Generate the database from the model. Also imported in our SQL Server
c7623a5
@ivanz
Import latest EF and MvcScaffolding.
bc240e4
@trreeves
added database project that is synced with entity framework model
2bd5801
@trreeves
added database project synced with entity framework model
dfc35f1
@ivanz
Merge branch 'master' of git://github.com/trevorreeves/dev4good
1090e96
@ivanz
Remove deleted files from the project.
6a10a8e
@ivanz
Remove the Test Generation Project
1637a30
@ivanz
Update the data model to 0..1 resource relationships
3d9aaf0
@ivanz @steveba14
Solution import with first-pass Data Model.
635e732
@ivanz @steveba14
Generate the database from the model. Also imported in our SQL Server
addcbef
@steveba14
mvc upload
481227a
@ivanz
Implemented a Google maps control and added a Maps menu item on top.
6085f39
@ivanz
Future proof the Map control to handle HTML content by using @Html.Raw()
4d28f49
@steveba14
Last nights work
2bb7281
@steveba14
Merge branch 'master' of github.com:steveba14/dev4good
d7ecfe9 
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
@ivanz
Merge branch 'master' of git://github.com/steveba14/dev4good
8ee16f7 
Conflicts:
	CharityPortal/CharityPortal/CharityPortal.csproj
	CharityPortal/CharityPortal/Views/Shared/_Layout.cshtml
@steveba14
telerik dlls
370476d
@ivanz
Update the entity model to remove some constraints on the relationships
ecf41a3
@ivanz
Merge branch 'master' of git://github.com/steveba14/dev4good
22a2257
@ivanz
Replaces Telerik Mvc reference with the one from libs
f2aa136
Added tweet scraper / resource matcher first version
4a380d7
Added resource matcher project to sln
faa6666
Add Rx dlls
af3c942
@ivanz
Fix the .sln to build the twitter service project as part of a soluti…
9072047 
…on build.
@ivanz
Fix Ractive reference to point to our libs folder
a8cb69b
Updated model with appsettings + maxlengths
147ebff 
Resource matcher doesn't reload old data on restart
@ivanz
Merge branch 'master' of git://github.com/andrassy/dev4good
40e4b1f
ivanz and others added 9 commits July 3, 2011 14:57
@ivanz
- Add a map to Organization to show its projects on the map
2a736a1 
- 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.
@ivanz
Included the project.png marker icon in the project
9c89720
@ivanz
Pluralize the menu items in the main menu and move About to be the la…
4d5836b 
…st one.
@steveba14
1515 buikd
d4f43b8
@ivanz
Merge branch 'master' of git://github.com/steveba14/dev4good
060fb1c 
Conflicts:
	CharityPortal/CharityPortal.sln
	CharityPortal/CharityPortal/Views/Shared/_Layout.cshtml
@ivanz
Delete some first commit test things
5659353
@steveba14
formatting
78e9138
@steveba14
Merge branch 'master' of https://github.com/ivanz/dev4good
eb70574
@steveba14
css fix
82dac3d
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@steveba14 @ivanz @trreeves