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

Already on GitHub? Sign in to your account

Erin media queries #11

Closed
wants to merge 47 commits into
from
Commits on Jul 11, 2014
Commits on Jul 12, 2014
  1. wrote some basic controller tests for the donors controller. Tested t…

    ErinJoan committed Jul 12, 2014
    …he index and new pages, as well as the happy and unhappy paths for the create page
  2. still working on the organizations controller spec. new and create ar…

    ErinJoan committed Jul 12, 2014
    …e finished but show and edit need work.
  3. Merge pull request #5 from manubete/associations_between_requests_don…

    manubete committed Jul 12, 2014
    …ors_and_organizations
    
    Associations between requests donors and organizations
  4. added some additional donor controller tests but still having trouble…

    ErinJoan committed Jul 12, 2014
    … with the organization show tests
  5. Figured out what was wrong with the organizations controller tests fo…

    ErinJoan committed Jul 12, 2014
    …r show and fixed it. Also added factories to DRY up the code slightly.
  6. created tests for when we finish building the edit organziations func…

    ErinJoan committed Jul 12, 2014
    …tionality. Right now the tests are pending because they might need to be changed, for example if we end up using patch instead of put.
  7. unit tests done for donor model

    ErinJoan committed Jul 12, 2014
  8. finished writing unit tests for request model, but I'm not sure if I …

    ErinJoan committed Jul 12, 2014
    …need to write a unit test for the search here or if that will just be a feature test, or what.
Commits on Jul 13, 2014
  1. Made the organizations have a has many relationship with requests NO…

    manubete committed Jul 13, 2014
    …TE this change affected the database, models and templates, be sure to drop the database and migrate if necessary
  2. Added a start and end date for the request object NOTE this affects t…

    manubete committed Jul 13, 2014
    …he database models and templates, drop the database and remigrate if necessary
  3. Finished the associations between donors, organizations and request t…

    manubete committed Jul 13, 2014
    …hrough the creation of contributions Note this change affected the db, models, views and controllers
  4. Merge pull request #6 from manubete/associations_between_requests_don…

    manubete committed Jul 13, 2014
    …ors_and_organizations
    
    Associations between requests donors and organizations
  5. changed styling

    muchcoffieeh committed Jul 13, 2014
  6. merge conflicts

    muchcoffieeh committed Jul 13, 2014
  7. merged with dev branch

    ErinJoan committed Jul 13, 2014
  8. merged with dev, 2 tests are not passing. The request controller test…

    ErinJoan committed Jul 13, 2014
    …s for new and show are saying Counldn't find organization without an ID
Commits on Jul 14, 2014
  1. donor controller tests updated

    ErinJoan committed Jul 14, 2014
  2. updated the request controller tests but something is wrong with the …

    ErinJoan committed Jul 14, 2014
    …routes. The new, edit and show tests are failing due to the relationship between a request and an organization. Rori, can you take a look?
Commits on Jul 15, 2014
  1. css changes

    muchcoffieeh committed Jul 15, 2014
Commits on Jul 16, 2014
  1. Added Basic implementation of db tags as well as a few changes to the…

    manubete committed Jul 16, 2014
    … requests show template and the donor profile
  2. css updates

    muchcoffieeh committed Jul 16, 2014
  3. styles

    muchcoffieeh committed Jul 16, 2014
  4. added validations and flash error messages to donors,orgs,requests as…

    manubete committed Jul 16, 2014
    … well as a password confirmation field for organizations
  5. merged with dev

    ErinJoan committed Jul 16, 2014
Commits on Jul 17, 2014
  1. fixed all the merge conflicts

    manubete committed Jul 17, 2014
  2. Added contributors list to the request show template, minor changes i…

    manubete committed Jul 17, 2014
    …nclude change on fields for organizations
Commits on Jul 18, 2014
  1. merged with dev

    ErinJoan committed Jul 18, 2014
  2. bundle and tests

    ErinJoan committed Jul 18, 2014
  3. fixed merge conflicts

    ErinJoan committed Jul 18, 2014
  4. not working yet

    ErinJoan committed Jul 18, 2014
  5. iPhone media queries done for landing page and user-type-confirmation…

    ErinJoan committed Jul 18, 2014
    … page. Error pops up and I can't register as a donor due to security_question field or as an organization due to description field