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

Yen #7

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open

Yen #7

wants to merge 82 commits into from

Commits on Jan 12, 2016

  1. Changed config, have to add more json manually

    @FredLoh
    FredLoh committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    30275eb View commit details
    Browse the repository at this point in the history

  2. Added pretty css

    @FredLoh
    FredLoh committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    74c19e0 View commit details
    Browse the repository at this point in the history

  3. Added code up to date

    @FredLoh
    FredLoh committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    eb4293a View commit details
    Browse the repository at this point in the history

  4. Began working on resume

    @FredLoh
    FredLoh committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    726d508 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. Added dynamic elements from firebase, 3 new tags

    @FredLoh
    FredLoh committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    ce0acc0 View commit details
    Browse the repository at this point in the history

  2. Minor changes to list

    @FredLoh
    FredLoh committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    992d64d View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. For daniel to get access

    @FredLoh
    FredLoh committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    6bca4d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2016

  1. Finished resume

    @FredLoh
    FredLoh committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    6334bd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2016

  1. Merge remote-tracking branch 'upstream/master 

    Added new info
    @FredLoh
    FredLoh committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    2f93ce9 View commit details
    Browse the repository at this point in the history

  2. Added three different indexes, changed JSON structure to firebase, de… 

    …ployed to firebase
    @FredLoh
    FredLoh committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    c420184 View commit details
    Browse the repository at this point in the history

  3. All pages now refresh automatically

    @FredLoh
    FredLoh committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    1ed235b View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Implemented changes by @DanielMaxson

    @FredLoh
    FredLoh committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    0307d84 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. Added skeleton code for button press, added button

    @FredLoh
    FredLoh committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    4d42e84 View commit details
    Browse the repository at this point in the history

  2. Form now submits to DB correctly, have to change all pages code to co… 

    …rrectly read DB
    @FredLoh
    FredLoh committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    11d6cf6 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. Added Rishab's changes, fixed button bug. Implemented same styling ac… 

    …ross all plataforms.
    @FredLoh
    FredLoh committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    21f0c52 View commit details
    Browse the repository at this point in the history

  2. Final commit for ToDO, forgot to do this on Friday

    @FredLoh
    FredLoh committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    0a7a57f View commit details
    Browse the repository at this point in the history

  3. Forgot to change index

    @FredLoh
    FredLoh committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    8951860 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2016

  1. Implemented Week 2 changes for resume

    @FredLoh
    FredLoh committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    ca29f0e View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @FredLoh
    FredLoh committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    d58f1bb View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. Added changes pushed to branch

    @FredLoh
    FredLoh committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    09d01b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2016

  1. Week 3

    @FredLoh
    FredLoh committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    ea3f22d View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @FredLoh
    FredLoh committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    e611c80 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. React of resume

    @FredLoh
    FredLoh committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    54801a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @FredLoh
    FredLoh committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    975bcfd View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Pushing week 5

    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    370306b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    0bf1ee7 View commit details
    Browse the repository at this point in the history

  3. Ahmed+Rishab client mockup

    @AHAAAAAAA
    AHAAAAAAA committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    cf5f217 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from FredLoh/client 

    Ahmed+Rishab client mockup
    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    2be63af View commit details
    Browse the repository at this point in the history

  5. Rishab+Ahmed Finished week 5 client mockup

    @rishabkanwal
    rishabkanwal committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    67f60f5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:FredLoh/book

    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    e885ae4 View commit details
    Browse the repository at this point in the history

  7. Added Yen's work

    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    af62057 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2 from FredLoh/client 

    Rishab+Ahmed Finished week 5 client mockup
    @rishabkanwal
    rishabkanwal committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    65690d9 View commit details
    Browse the repository at this point in the history

  9. Mockup Admin

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    1e19b63 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #3 from FredLoh/yen 

    Mockup Admin
    @FredLoh
    FredLoh committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    13f84e1 View commit details
    Browse the repository at this point in the history

  11. Actually finished week 5 hackathon

    @rishabkanwal
    rishabkanwal committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    5a9a651 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #4 from FredLoh/client 

    Actually finished week 5 hackathon
    @rishabkanwal
    rishabkanwal committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    b2d6407 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Finished team

    @rishabkanwal
    rishabkanwal committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    6342c3c View commit details
    Browse the repository at this point in the history

  2. Updated index for mockup

    @rishabkanwal
    rishabkanwal committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    4bf5f8e View commit details
    Browse the repository at this point in the history

  3. Workers now work

    @rishabkanwal
    rishabkanwal committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    2df735c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from FredLoh/client 

    Added workers and updated mockup
    @rishabkanwal
    rishabkanwal committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    c3e71d4 View commit details
    Browse the repository at this point in the history

  5. Changed worker location to boulder

    @rishabkanwal
    rishabkanwal committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    d776e70 View commit details
    Browse the repository at this point in the history

  6. admin page

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    90d3ef8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6 from FredLoh/yen 

    admin page
    @yeli7289
    yeli7289 committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    ca5e0bb View commit details
    Browse the repository at this point in the history

  8. ready to submit main and admin page

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    d1d1a24 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #7 from FredLoh/yen 

    ready to submit main and admin page
    @yeli7289
    yeli7289 committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    88f9286 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2016

  1. Changed worker location to boulder

    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    dc89da8 View commit details
    Browse the repository at this point in the history

  2. Cleaned up admin and index for Uber

    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    cbc4602 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'client' of https://github.com/FredLoh/book into client1

    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    09501d4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from FredLoh/admin 

    Admin
    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    c1dc1ba View commit details
    Browse the repository at this point in the history

  5. Merge pull request #9 from FredLoh/client 

    Client
    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    77decef View commit details
    Browse the repository at this point in the history

  6. Finished week 5

    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    f3fca4a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #10 from FredLoh/client 

    Finished week 5
    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    006fdaa View commit details
    Browse the repository at this point in the history

  8. Updated worker dependencies

    @rishabkanwal
    rishabkanwal committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    c915675 View commit details
    Browse the repository at this point in the history

  9. ..

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    0ac0504 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2016

  1. Merge pull request #11 from FredLoh/client 

    Finished team
    @rishabkanwal
    rishabkanwal committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    a6fdce1 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. ..

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    330d964 View commit details
    Browse the repository at this point in the history

  2. ..

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    2a09e57 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #12 from FredLoh/yen 

    Yen
    @FredLoh
    FredLoh committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    ced80eb View commit details
    Browse the repository at this point in the history

  4. driver and restaurant view

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    7ec480b View commit details
    Browse the repository at this point in the history

  5. driver and restaurant view

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    302de46 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13 from FredLoh/yen 

    driver and restaurant view
    @yeli7289
    yeli7289 committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    e1e20e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. update the click function of client and restaurant site

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    d188ed4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from FredLoh/yen 

    update the click function of client and restaurant site
    @yeli7289
    yeli7289 committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    4553dd1 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. make index landing page more ok

    @AHAAAAAAA
    AHAAAAAAA committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    ede4a2a View commit details
    Browse the repository at this point in the history

  2. Update index.html 

    Navbar function works
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    b14cd69 View commit details
    Browse the repository at this point in the history

  3. Update index.html

    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    9bd2f23 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #15 from FredLoh/Boraz-nav-working 

    Update index.html
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    b4b2012 View commit details
    Browse the repository at this point in the history

  5. Update index.html 

    nav funtional
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    2fc670f View commit details
    Browse the repository at this point in the history

  6. Update index.html 

    nav functional
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    be52690 View commit details
    Browse the repository at this point in the history

  7. Added files via upload 

    started work on order button
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    e442eed View commit details
    Browse the repository at this point in the history

  8. Merge pull request #16 from FredLoh/Boraz-orders-button-after-login 

    Added files via upload
    @Boraz
    Boraz committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    0201dfe View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2016

  1. Adding Orders.html page

    Daniel authored and Daniel committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    7bd8e1f View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2016

  1. orders page fix by yen

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    0286e67 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from FredLoh/yen 

    orders page fix by yen
    @yeli7289
    yeli7289 committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    2b2f46b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    4a21955 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from FredLoh/Week6 

    Week6
    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    d14e221 View commit details
    Browse the repository at this point in the history

  5. Updated plan and execution

    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    588c86f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #19 from FredLoh/Week6 

    Updated plan and execution
    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    081dc24 View commit details
    Browse the repository at this point in the history

  7. Added differences from original plan

    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    6d798b0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #20 from FredLoh/Week6 

    Added differences from original plan
    @rishabkanwal
    rishabkanwal committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    3f8e8f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2016

  1. Make index page legible

    @AHAAAAAAA
    AHAAAAAAA committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    01653f9 View commit details
    Browse the repository at this point in the history

  2. background

    Yen-Teh Liu authored and Yen-Teh Liu committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    4888eac View commit details
    Browse the repository at this point in the history