Permalink
Switch branches/tags
Nothing to show
Commits on Sep 24, 2012
  1. Merge pull request #17 from sykesda/Andrew

    Andrew
    strasburgerad committed Sep 24, 2012
Commits on Sep 23, 2012
  1. Merge pull request #16 from sykesda/master

    this allows Andrew to work with all of the files up to date
    strasburgerad committed Sep 23, 2012
  2. Merge pull request #15 from sykesda/userInterface

    User interface
    humphriesaj committed Sep 23, 2012
  3. userInterface.py now takes a question object as its parameter. userIn…

    …terfaceUnitTest.py has been modified to reflect this change.
    humphriesaj committed Sep 23, 2012
  4. Merge pull request #14 from sykesda/Andrew

    Andrew
    strasburgerad committed Sep 23, 2012
  5. Updated quiz file

    strasburgerad committed Sep 23, 2012
  6. Merge pull request #13 from sykesda/master

    this allows Andrew to work with all of the files up to date
    strasburgerad committed Sep 23, 2012
  7. Merge pull request #7 from sykesda/Greg

    Greg
    humphriesaj committed Sep 23, 2012
  8. Merge pull request #12 from sykesda/Andrew

    Greg's edited questionBank
    strasburgerad committed Sep 23, 2012
  9. Greg's edited questionBank

    strasburgerad committed Sep 23, 2012
  10. Merge pull request #11 from sykesda/userInterface

    User interface
    strasburgerad committed Sep 23, 2012
  11. Merge pull request #10 from sykesda/Andrew

    Andrew
    strasburgerad committed Sep 23, 2012
  12. Merge pull request #9 from sykesda/master

    allow me to work on all of the most recent files
    strasburgerad committed Sep 23, 2012
  13. userInterface.py now takes a question object as its parameter. userIn…

    …terfaceUnitTest.py has been modified to reflect the change.
    humphriesaj committed Sep 23, 2012
  14. Merge pull request #8 from sykesda/quiz

    This is the code for the quiz object
    strasburgerad committed Sep 23, 2012
  15. userInterface.py now takes a question object as its parameter. userIn…

    …terfaceUnitTest.py has been modified to reflect the change.
    humphriesaj committed Sep 23, 2012
  16. userInterface.py now takes a question object as a parameter. userInte…

    …rfaceUnitTest.py has been modified to reflect this change.
    humphriesaj committed Sep 23, 2012
  17. Merge pull request #4 from sykesda/Andrew

    Andrew
    humphriesaj committed Sep 23, 2012
  18. added a IsCorrect function

    strasburgerad committed Sep 23, 2012
  19. userInterface.py now takes a question object as a parameter and not a…

    … quiz object. The test code in userInterfaceUnitTest.py has been modified to reflect the change.
    humphriesaj committed Sep 23, 2012
  20. userInterface.py now takes a Question object as a parameter and not a…

    … Quiz object. The test code has been modified to reflect this change.
    humphriesaj committed Sep 23, 2012
  21. Greg's Question Bank class

    strasburgerad committed Sep 23, 2012
Commits on Sep 21, 2012
  1. Merge pull request #2 from sykesda/Andrew

    Andrew
    strasburgerad committed Sep 21, 2012
  2. Merge pull request #1 from strasburgerad/Andrew

    This is the database for our project
    sykesda committed Sep 21, 2012
  3. Revert "This is the database for our first sprint"

    This reverts commit e69cb98.
    strasburgerad committed Sep 21, 2012
Commits on Sep 20, 2012
  1. This version no longer checks for Quiz.getQuestion() to

    return None when there are no more questions.  This is to
    be handled by the quiz when no more questions are to be
    sent to the screen.  The new method endOfQuiz() is used
    to display text indicating to the client that the quiz has
    ended.
    humphriesaj committed Sep 20, 2012