Skip to content
New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edward/diane/login #3

Open
wants to merge 45 commits into
base: dev
Choose a base branch
from
Open

Edward/diane/login #3

wants to merge 45 commits into from

Commits on Oct 15, 2019

  1. pg not working

    @apaisner
    apaisner committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    ee74358 View commit details
    Browse the repository at this point in the history

  2. w

    @apaisner
    apaisner committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    2825842 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. db working

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    5b5f1be View commit details
    Browse the repository at this point in the history

  2. andrew/words

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    8de88f6 View commit details
    Browse the repository at this point in the history

  3. end point /word working

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    7f08c82 View commit details
    Browse the repository at this point in the history

  4. accepted merge changes

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    63b3638 View commit details
    Browse the repository at this point in the history

  5. branch

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    c1b3063 View commit details
    Browse the repository at this point in the history

  6. branch

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    42e4149 View commit details
    Browse the repository at this point in the history

  7. add redirect to game from login

    @ewgewgewg
    ewgewgewg committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    2b2541b View commit details
    Browse the repository at this point in the history

  8. storing changes before pulling

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    14650c2 View commit details
    Browse the repository at this point in the history

  9. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    08fc21a View commit details
    Browse the repository at this point in the history

  10. merging testing branch

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    bf46c21 View commit details
    Browse the repository at this point in the history

  11. before testing merge

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    1450ba8 View commit details
    Browse the repository at this point in the history

  12. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    4f41ff2 View commit details
    Browse the repository at this point in the history

  13. added functionality to login page handleChange for username and password

    @dianewudw
    dianewudw committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    756813b View commit details
    Browse the repository at this point in the history

  14. answers and clues are coming from db words. The sockets do not work a… 

    …nd have been commited out for now in server.js
    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    c173605 View commit details
    Browse the repository at this point in the history

  15. updated git ignore

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    c09e540 View commit details
    Browse the repository at this point in the history

  16. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    8bea47b View commit details
    Browse the repository at this point in the history

  17. fixed merge conflict

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    6161a85 View commit details
    Browse the repository at this point in the history

  18. fixed merge conflict in package.json

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    4ae5e5b View commit details
    Browse the repository at this point in the history

  19. d

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    ef93ec1 View commit details
    Browse the repository at this point in the history

  20. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    d924c92 View commit details
    Browse the repository at this point in the history

  21. fixed up game logic

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    9bb8130 View commit details
    Browse the repository at this point in the history

  22. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    394355d View commit details
    Browse the repository at this point in the history

  23. branch

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    cedd26c View commit details
    Browse the repository at this point in the history

  24. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    c2b0b5d View commit details
    Browse the repository at this point in the history

  25. backend

    Rocky Lin committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    9354a3c View commit details
    Browse the repository at this point in the history

  26. andrew

    @apaisner
    apaisner committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    126eaf1 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. added img of hangman and fixed game logic

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    b36dc5b View commit details
    Browse the repository at this point in the history

  2. grabs users from database and enters player into game

    @dianewudw
    dianewudw committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    d59e768 View commit details
    Browse the repository at this point in the history

  3. backend

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    632d572 View commit details
    Browse the repository at this point in the history

  4. latest merged branch

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    0c83906 View commit details
    Browse the repository at this point in the history

  5. latest merged branch

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    b58d86e View commit details
    Browse the repository at this point in the history

  6. Uppercase answers now display

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    6ace7ae View commit details
    Browse the repository at this point in the history

  7. success-page

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    ba97bd0 View commit details
    Browse the repository at this point in the history

  8. fixed merge conflict

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    8d52b23 View commit details
    Browse the repository at this point in the history

  9. latest merged backend

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    2adf033 View commit details
    Browse the repository at this point in the history

  10. merge conflicts fixed

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    c93f276 View commit details
    Browse the repository at this point in the history

  11. added styling and sign up

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    08e24d2 View commit details
    Browse the repository at this point in the history

  12. backend

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    442ff42 View commit details
    Browse the repository at this point in the history

  13. adding signup.jsx

    @apaisner
    apaisner committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    ae9cf7a View commit details
    Browse the repository at this point in the history

  14. merged

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    6aaf451 View commit details
    Browse the repository at this point in the history

  15. merged backend

    Rocky Lin committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    3988b70 View commit details
    Browse the repository at this point in the history

  16. added highs Score and button on gameRoom

    @dianewudw
    dianewudw committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    01aa81a View commit details
    Browse the repository at this point in the history

  17. final game

    @dianewudw
    dianewudw committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    70f44ea View commit details
    Browse the repository at this point in the history