Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Erin media queries #12

Closed
wants to merge 23 commits into from

1 participant

@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 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 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
@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 updated application.css and mediaqueries files da35cc1
@ErinJoan ErinJoan changes to donor validations d3576ab
@ErinJoan ErinJoan changes to organization validations c2a7637
@ErinJoan ErinJoan removed uniqueness validation tests in the controllers because we're …
…testing that in the models already
2e418c6
@ErinJoan ErinJoan cleaned up and uncommented requests controller specs that were commen…
…ted out
8ee3817
@ErinJoan ErinJoan all 95 tests are passing after the latest update. TODO finish session…
…s controller tests and move on to more feature tests
119a5a0
@ErinJoan ErinJoan merged with media queries branch faac4a1
@ErinJoan ErinJoan stupid error with rspec. Where did that come from? 7e68634
@ErinJoan ErinJoan bundle b1d0742
@ErinJoan ErinJoan fixed merge conflicts d109db2
@ErinJoan ErinJoan rspec error won't go away. DO NOT MERGE UNTIL I CAN FIX IT 8ecf653
@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 16, 2014
  1. @ErinJoan
  2. @ErinJoan

    merged with dev

    ErinJoan authored
Commits on Jul 17, 2014
  1. @ErinJoan
Commits on Jul 18, 2014
  1. @ErinJoan

    merged with dev

    ErinJoan authored
  2. @ErinJoan

    bundle and tests

    ErinJoan authored
  3. @ErinJoan

    fixed merge conflicts

    ErinJoan authored
  4. @ErinJoan
  5. @ErinJoan

    not working yet

    ErinJoan authored
  6. @ErinJoan
  7. @ErinJoan

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

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

    changes to donor validations

    ErinJoan authored
  10. @ErinJoan
  11. @ErinJoan

    removed uniqueness validation tests in the controllers because we're …

    ErinJoan authored
    …testing that in the models already
  12. @ErinJoan
Commits on Jul 19, 2014
  1. @ErinJoan

    all 95 tests are passing after the latest update. TODO finish session…

    ErinJoan authored
    …s controller tests and move on to more feature tests
  2. @ErinJoan
  3. @ErinJoan
  4. @ErinJoan

    bundle

    ErinJoan authored
  5. @ErinJoan

    fixed merge conflicts

    ErinJoan authored
  6. @ErinJoan
Something went wrong with that request. Please try again.