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

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

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

    humphriesaj committed Sep 23, 2012
    …terfaceUnitTest.py has been modified to reflect this change.
  4. Updated quiz file

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

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

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

    strasburgerad committed Sep 23, 2012
    Greg's edited questionBank
  8. Merge pull request #11 from sykesda/userInterface

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

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

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

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

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

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

    humphriesaj committed Sep 23, 2012
    Andrew
  15. userInterface.py now takes a question object as a parameter and not a…

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

    humphriesaj committed Sep 23, 2012
    … Quiz object. The test code has been modified to reflect this change.
Commits on Sep 21, 2012
  1. Merge pull request #1 from strasburgerad/Andrew

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

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

    humphriesaj committed Sep 20, 2012
    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.