Commits on Apr 10, 2012
  1. Merge pull request #12 from ArtisOracle/master

    4-10 2:02 AM
    committed Apr 10, 2012
  2. @ArtisOracle
  3. Merge pull request #11 from ArtisOracle/master

    Pull Request Accepted
    committed Apr 9, 2012
  4. @ArtisOracle

    Searchresults stuff

    ArtisOracle committed Apr 9, 2012
  5. @ArtisOracle

    Merge remote-tracking branch 'Upstream/master'

    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.cs
    ArtisOracle committed Apr 9, 2012
  6. @ArtisOracle

    Search changed

    ArtisOracle committed Apr 9, 2012
  7. Added Admin Hardcode Login

    committed Apr 9, 2012
  8. GOT SEARCH TO WORK

    committed Apr 9, 2012
Commits on Apr 9, 2012
  1. @ArtisOracle

    Merge remote-tracking branch 'Upstream/master'

    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.cs
    ArtisOracle committed Apr 9, 2012
  2. @ArtisOracle

    SearchResults changed

    ArtisOracle committed Apr 9, 2012
  3. Register done, need to know what to do on login to have it authenticate

    Also Receiving error on Text='<%# Eval("Email") %>' when trying to bind data to ResultsGridView.
    committed Apr 9, 2012
  4. Years Hardcoded Merged

    committed Apr 9, 2012
  5. Years Hardcoded Merge branch 'master' of https://github.com/ArtisOrac…

    …le/Origin-CIS-375-Website-Project into ArtisOracle-master
    
    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/Register.aspx.cs
    committed Apr 9, 2012
  6. @ArtisOracle
  7. Merge branch 'ArtisOracle-master'

    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/Register.aspx.cs
    
    Got updates from Register.asp.x.cs from stefan
    committed Apr 9, 2012
  8. @ArtisOracle
Commits on Apr 8, 2012
  1. @ArtisOracle
  2. Merge branch 'master' of https://github.com/ArtisOracle/Origin-CIS-37…

    …5-Website-Project into ArtisOracle-master
    
    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool.suo
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/Register.aspx.cs
    committed Apr 8, 2012
  3. Merge branch 'master' of https://github.com/ArtisOracle/Origin-CIS-37…

    …5-Website-Project
    
    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool.suo
    committed Apr 8, 2012
  4. @ArtisOracle
Commits on Apr 7, 2012
  1. @ArtisOracle
  2. Merge branch 'master' of https://github.com/ArtisOracle/Origin-CIS-37…

    …5-Website-Project into ArtisOracle-master
    
    Conflicts:
    	.gitignore
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool.suo
    committed Apr 7, 2012
  3. Merge branch 'master' of https://github.com/ArtisOracle/Origin-CIS-37…

    …5-Website-Project into ArtisOracle-master
    
    Conflicts:
    	StudentAlumniTrackingTool/StudentAlumniTrackingTool.suo
    committed Apr 7, 2012
  4. @ArtisOracle

    .suo ignore

    ArtisOracle committed Apr 7, 2012
  5. @ArtisOracle
  6. @ArtisOracle
  7. @ArtisOracle

    Numerous changes to search, edit, profile pages. Session variables ed…

    …ited, SQL queries ready to be accepted
    ArtisOracle committed Apr 7, 2012