Skip to content

Loading…

Erin media queries #11

Closed
wants to merge 47 commits into from

3 participants

@ErinJoan
Collaborator

iPhone media queries are finished, but something in rspec is broken. DO NOT MERGE. Check against the dev file to try and see what the hell is wrong with rspec.

If needed, copy and paste all the .css files and the application.html.erb file over the existing ones in dev.

ErinJoan and others added some commits
@ErinJoan ErinJoan media queries are not being read 09ee72d
@ErinJoan ErinJoan created require tree in application csss, moved styling to style.css 8fdf1f1
@ErinJoan ErinJoan wrote some basic controller tests for the donors controller. Tested t…
…he index and new pages, as well as the happy and unhappy paths for the create page
5564644
@ErinJoan ErinJoan still working on the organizations controller spec. new and create ar…
…e finished but show and edit need work.
fdc1def
@manubete added donor/organization profiles with edit functionality f2dade2
@manubete added the complete flag on requests to distinguish between active/com…
…plete requests
9625754
@manubete Merge pull request #5 from manubete/associations_between_requests_don…
…ors_and_organizations

Associations between requests donors and organizations
6680245
@ErinJoan ErinJoan added some additional donor controller tests but still having trouble…
… with the organization show tests
0f76e0b
@ErinJoan ErinJoan Figured out what was wrong with the organizations controller tests fo…
…r show and fixed it. Also added factories to DRY up the code slightly.
291ce21
@ErinJoan ErinJoan created tests for when we finish building the edit organziations func…
…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.
b8394d5
@ErinJoan ErinJoan finished writing request controller tests d4286d0
@ErinJoan ErinJoan unit tests done for donor model a10ec1f
@ErinJoan ErinJoan finished writing unit tests for request model, but I'm not sure if I …
…need to write a unit test for the search here or if that will just be a feature test, or what.
f7a1075
@ErinJoan ErinJoan finished writing unit tests for organization model 5118f22
@ErinJoan ErinJoan started on the sessions controller tests d9923bc
@manubete Made the organizations have a has many relationship with requests NO…
…TE this change affected the database, models and templates, be sure to drop the database and migrate if necessary
ba0503e
@manubete Added a start and end date for the request object NOTE this affects t…
…he database models and templates, drop the database and remigrate if necessary
a155844
@manubete Finished the associations between donors, organizations and request t…
…hrough the creation of contributions Note this change affected the db, models, views and controllers
167d18e
@manubete Merge pull request #6 from manubete/associations_between_requests_don…
…ors_and_organizations

Associations between requests donors and organizations
01459ec
@muchcoffieeh muchcoffieeh changed styling d338857
@muchcoffieeh muchcoffieeh merge conflicts 0dfd1e4
@ErinJoan ErinJoan merged with dev branch 044166b
@ErinJoan ErinJoan merged with dev, 2 tests are not passing. The request controller test…
…s for new and show are saying Counldn't find organization without an ID
b5183f9
@ErinJoan ErinJoan organizations controller tests updated to include edit and update routes 317a4f9
@ErinJoan ErinJoan donor controller tests updated 077733b
@ErinJoan ErinJoan updated the request controller tests but something is wrong with the …
…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?
6a3cd18
@muchcoffieeh muchcoffieeh css changes 72a8502
@manubete Added some of the new db fields to the factory girl file 514f236
@manubete Merge branch 'erins_writing_some_tests' into dev 2475a38
@manubete Added Basic implementation of db tags as well as a few changes to the…
… requests show template and the donor profile
9ff5c03
@muchcoffieeh muchcoffieeh css updates 77499f2
@muchcoffieeh muchcoffieeh styles 95f6e15
@manubete added validations and flash error messages to donors,orgs,requests as…
… well as a password confirmation field for organizations
160f432
@ErinJoan ErinJoan writing feature tests. New donor registration does not work. 62c90c9
@ErinJoan ErinJoan merged with dev 8fe533a
@ErinJoan ErinJoan shoulda matchers model tests are finished 422d0e6
@manubete fixed all the merge conflicts cffb720
@manubete Merge branch 'CSS_serena' into dev f9d5d58
@manubete Added contributors list to the request show template, minor changes i…
…nclude change on fields for organizations
acaa77f
@manubete added security question/answer functionality (with tests :D) 8798093
@ErinJoan ErinJoan merged with dev f57505b
@ErinJoan ErinJoan bundle and tests 7d41ac6
@ErinJoan ErinJoan fixed merge conflicts 33439ca
@ErinJoan ErinJoan Merge branch 'erins_writing_some_tests' into erin_media_queries a4cbaeb
@ErinJoan ErinJoan not working yet bb41634
@ErinJoan ErinJoan it's working now. thank to melanie archer f31beb8
@ErinJoan ErinJoan iPhone media queries done for landing page and user-type-confirmation…
… 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
2714352
@ErinJoan ErinJoan closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 11, 2014
  1. @ErinJoan
  2. @ErinJoan
Commits on Jul 12, 2014
  1. @ErinJoan

    wrote some basic controller tests for the donors controller. Tested t…

    ErinJoan committed
    …he index and new pages, as well as the happy and unhappy paths for the create page
  2. @ErinJoan

    still working on the organizations controller spec. new and create ar…

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

    committed
    …ors_and_organizations
    
    Associations between requests donors and organizations
  4. @ErinJoan

    added some additional donor controller tests but still having trouble…

    ErinJoan committed
    … with the organization show tests
  5. @ErinJoan

    Figured out what was wrong with the organizations controller tests fo…

    ErinJoan committed
    …r show and fixed it. Also added factories to DRY up the code slightly.
  6. @ErinJoan

    created tests for when we finish building the edit organziations func…

    ErinJoan committed
    …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. @ErinJoan
  8. @ErinJoan

    unit tests done for donor model

    ErinJoan committed
  9. @ErinJoan

    finished writing unit tests for request model, but I'm not sure if I …

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

    committed
    …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…

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

    committed
    …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…

    committed
    …ors_and_organizations
    
    Associations between requests donors and organizations
  5. @muchcoffieeh

    changed styling

    muchcoffieeh committed
  6. @muchcoffieeh

    merge conflicts

    muchcoffieeh committed
  7. @ErinJoan

    merged with dev branch

    ErinJoan committed
  8. @ErinJoan

    merged with dev, 2 tests are not passing. The request controller test…

    ErinJoan committed
    …s for new and show are saying Counldn't find organization without an ID
Commits on Jul 14, 2014
  1. @ErinJoan
  2. @ErinJoan

    donor controller tests updated

    ErinJoan committed
  3. @ErinJoan

    updated the request controller tests but something is wrong with the …

    ErinJoan committed
    …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. @muchcoffieeh

    css changes

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

    committed
    … requests show template and the donor profile
  2. @muchcoffieeh

    css updates

    muchcoffieeh committed
  3. @muchcoffieeh

    styles

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

    committed
    … well as a password confirmation field for organizations
  5. @ErinJoan
  6. @ErinJoan

    merged with dev

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

    committed
  3. Added contributors list to the request show template, minor changes i…

    committed
    …nclude change on fields for organizations
Commits on Jul 18, 2014
  1. @ErinJoan

    merged with dev

    ErinJoan committed
  2. @ErinJoan

    bundle and tests

    ErinJoan committed
  3. @ErinJoan

    fixed merge conflicts

    ErinJoan committed
  4. @ErinJoan
  5. @ErinJoan

    not working yet

    ErinJoan committed
  6. @ErinJoan
  7. @ErinJoan

    iPhone media queries done for landing page and user-type-confirmation…

    ErinJoan committed
    … 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
Something went wrong with that request. Please try again.