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

Last fix #81

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

Last fix #81

wants to merge 180 commits into from

Commits on Jul 14, 2015

  1. sources route

    @mitcha16
    mitcha16 committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    511e0ea View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from mitchashby16/bad_request_identifier 

    sources route
    @dsshim
    dsshim committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    d5dec4e View commit details
    Browse the repository at this point in the history

  3. Application Registration - Bad Request - Identifier

    @mitcha16
    mitcha16 committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    1b1ef2a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #19 from mitchashby16/bad_request_identifier 

    Application Registration - Bad Request - Identifier
    @dsshim
    dsshim committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    ee090a2 View commit details
    Browse the repository at this point in the history

  5. added successful registration path and test

    @mitcha16
    mitcha16 committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    b095850 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from mitchashby16/bad_request_identifier 

    added successful registration path and test
    @dsshim
    dsshim committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    1a7b329 View commit details
    Browse the repository at this point in the history

  7. work in progess for multiple identifiers

    @mitcha16
    mitcha16 committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    6d1e95b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #21 from mitchashby16/bad_request_identifier 

    work in progess for multiple identifiers
    @dsshim
    dsshim committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    a026a18 View commit details
    Browse the repository at this point in the history

  9. finished app registration tests

    @dsshim
    dsshim committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    bdf1a79 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #22 from mitchashby16/app_reg_403 

    finished app registration tests
    @noobjey
    noobjey committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    28b4198 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2015

  1. added test_script

    @mitcha16
    mitcha16 committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    7ba2c95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from mitchashby16/test_script 

    added test_script closes #23
    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    28547cf View commit details
    Browse the repository at this point in the history

  3. remove hidden fodler

    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    5097b98 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #24 from mitchashby16/kill_folder 

    remove hidden fodler
    @dsshim
    dsshim committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    a8bca93 View commit details
    Browse the repository at this point in the history

  5. test data to play with in dev

    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    950d9f9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #26 from mitchashby16/test_script 

    test data to play with in dev
    @dsshim
    dsshim committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    bde9aa4 View commit details
    Browse the repository at this point in the history

  7. registration data saves to database

    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    8f2219b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #27 from mitchashby16/registration_input#25 

    registration data saves to database
    @dsshim
    dsshim committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    c5b4e43 View commit details
    Browse the repository at this point in the history

  9. stores urls

    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    93e64e8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #28 from mitchashby16/5-store_payload 

    stores urls
    @dsshim
    dsshim committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    4e27591 View commit details
    Browse the repository at this point in the history

  11. does not save duplicate payloads client

    @noobjey
    noobjey committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    f316284 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #29 from mitchashby16/7-payload_already_recieved 

    does not save duplicate payloads client
    @dsshim
    dsshim committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    f9281cf View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2015

  1. working on parser

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    1aaa393 View commit details
    Browse the repository at this point in the history

  2. fixed url/parser tests

    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    ae78d25 View commit details
    Browse the repository at this point in the history

  3. WIP

    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    709ce90 View commit details
    Browse the repository at this point in the history

  4. add data handler

    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    cd60d7c View commit details
    Browse the repository at this point in the history

  5. using payload parser

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    98967a0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #31 from mitchashby16/parse_input 

    Parse input
    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    ede835a View commit details
    Browse the repository at this point in the history

  7. added guard gems

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    9b8da88 View commit details
    Browse the repository at this point in the history

  8. parser handles screen resolutions

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    50ed7d9 View commit details
    Browse the repository at this point in the history

  9. parse returns event input

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    ff30ce1 View commit details
    Browse the repository at this point in the history

  10. urls method fix

    @mitcha16
    mitcha16 committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    132293d View commit details
    Browse the repository at this point in the history

  11. Merge pull request #32 from mitchashby16/create_user_agents 

    urls method fix
    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    eadd25e View commit details
    Browse the repository at this point in the history

  12. removed rake from prod deploys

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    5e3b612 View commit details
    Browse the repository at this point in the history

  13. operating system per request not working, storing to overcome big merge

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    05dea98 View commit details
    Browse the repository at this point in the history

  14. return operating system table input

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    ebc0a6f View commit details
    Browse the repository at this point in the history

  15. refactored methods into initialize

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    6e1baed View commit details
    Browse the repository at this point in the history

  16. added screen resolution table

    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    9c6a3c8 View commit details
    Browse the repository at this point in the history

  17. fix a space

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    51dd385 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into merge_try

    @noobjey
    noobjey committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    cd393ac View commit details
    Browse the repository at this point in the history

  19. Merge pull request #33 from mitchashby16/merge_try 

    Merge try
    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    d77f42c View commit details
    Browse the repository at this point in the history

  20. screen_res model test

    @dsshim
    dsshim committed Jul 16, 2015
    Configuration menu
    Copy the full SHA
    66abf66 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2015

  1. removed bad curl from script

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    fd499be View commit details
    Browse the repository at this point in the history

  2. added pry to other environment

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    604326a View commit details
    Browse the repository at this point in the history

  3. i accidently commited to master, this is try getting it right

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    d65eb15 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #34 from mitchashby16/fixing_master 

    Fixing master
    @dsshim
    dsshim committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    eddba0d View commit details
    Browse the repository at this point in the history

  5. fixed issue with guard

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    48d729d View commit details
    Browse the repository at this point in the history

  6. fixed shim's mistakes

    @mitcha16
    mitcha16 committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    8ff077c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #35 from mitchashby16/create_user_agents 

    fixed shim's mistakes
    @dsshim
    dsshim committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    d4011af View commit details
    Browse the repository at this point in the history

  8. os tables added

    @dsshim
    dsshim committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    68c47f0 View commit details
    Browse the repository at this point in the history

  9. os test

    @dsshim
    dsshim committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    a11835c View commit details
    Browse the repository at this point in the history

  10. Merge pull request #36 from mitchashby16/os_tables 

    os tables added
    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    3d7327b View commit details
    Browse the repository at this point in the history

  11. events table

    @mitcha16
    mitcha16 committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    ec947b6 View commit details
    Browse the repository at this point in the history

  12. using registration handler

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    73a7395 View commit details
    Browse the repository at this point in the history

  13. fixed merge conflict

    @mitcha16
    mitcha16 committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    f7cebc4 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #37 from mitchashby16/events_table 

    events table
    @dsshim
    dsshim committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    a649c31 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into registration_handler

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    b115f9f View commit details
    Browse the repository at this point in the history

  16. Merge pull request #38 from mitchashby16/registration_handler 

    Registration handler. Dave pushed button
    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    1bef3a2 View commit details
    Browse the repository at this point in the history

  17. data processing handler test base

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    0bf5e32 View commit details
    Browse the repository at this point in the history

  18. registration handler model tests complete

    @noobjey
    noobjey committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    132eb15 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2015

  1. added most visited urls

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    a179f4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39 from mitchashby16/app_details 

    added most visited urls
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    98cb015 View commit details
    Browse the repository at this point in the history

  3. fixed url error message

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    147e7b7 View commit details
    Browse the repository at this point in the history

  4. urls route

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    e831cee View commit details
    Browse the repository at this point in the history

  5. Merge pull request #40 from mitchashby16/url_error 

    fixed url error message
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    75658f4 View commit details
    Browse the repository at this point in the history

  6. urls path

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    cbc3946 View commit details
    Browse the repository at this point in the history

  7. urls path

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    27dd012 View commit details
    Browse the repository at this point in the history

  8. work in progress

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    3e1d85b View commit details
    Browse the repository at this point in the history

  9. working on link data

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    87fc4ba View commit details
    Browse the repository at this point in the history

  10. Merge pull request #41 from mitchashby16/link_stats 

    working on link data
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    0634a5e View commit details
    Browse the repository at this point in the history

  11. urls

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    3f4ee5c View commit details
    Browse the repository at this point in the history

  12. urls

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    8cb56cb View commit details
    Browse the repository at this point in the history

  13. merged urls statistics

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    41a25d9 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #42 from mitchashby16/urls_statistics 

    Urls statistics
    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    246f7cd View commit details
    Browse the repository at this point in the history

  15. payload parser returns nil when there is no payload

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    d9d8d32 View commit details
    Browse the repository at this point in the history

  16. fixed bug and changed tests to catch it

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    b49b07c View commit details
    Browse the repository at this point in the history

  17. refacorted for URL parser

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    38a03ad View commit details
    Browse the repository at this point in the history

  18. Merge pull request #43 from mitchashby16/urls_statistics 

    refacorted for URL parser
    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    644bbc0 View commit details
    Browse the repository at this point in the history

  19. links parser working

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    a8f1c73 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #44 from mitchashby16/link_parsing 

    links parser working
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    1e2e425 View commit details
    Browse the repository at this point in the history

  21. fixed links

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    0691225 View commit details
    Browse the repository at this point in the history

  22. merging

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    29aa574 View commit details
    Browse the repository at this point in the history

  23. url parser added

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    5368de2 View commit details
    Browse the repository at this point in the history

  24. data processing handler tests

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    4dda11c View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' into handler_model_tests

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    783738b View commit details
    Browse the repository at this point in the history

  26. uncomment tests

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    7f24769 View commit details
    Browse the repository at this point in the history

  27. all data processing tests use same input payload

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    d9367ee View commit details
    Browse the repository at this point in the history

  28. Merge pull request #45 from mitchashby16/handler_model_tests 

    Handler model tests
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    f837d8c View commit details
    Browse the repository at this point in the history

  29. merged jason's changes

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    21a42db View commit details
    Browse the repository at this point in the history

  30. added feature tests

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    8470cd5 View commit details
    Browse the repository at this point in the history

  31. finished handler tests

    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    c250dac View commit details
    Browse the repository at this point in the history

  32. added readme

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    52849ef View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' of github.com:mitchashby16/traffic_spy

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    bc13698 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #46 from mitchashby16/feature_tests 

    added feature tests
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    1437ccb View commit details
    Browse the repository at this point in the history

  35. Merge branch 'master' of github.com:mitchashby16/traffic_spy

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    1e59c8c View commit details
    Browse the repository at this point in the history

  36. Merge pull request #47 from mitchashby16/tests 

    finished handler tests
    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    96374c4 View commit details
    Browse the repository at this point in the history

  37. changed method name

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    8b2c97e View commit details
    Browse the repository at this point in the history

  38. change data processor to return success response body to whats requir… 

    …ements expect
    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    bde198c View commit details
    Browse the repository at this point in the history

  39. feature tests for app data and sources

    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    8e026d3 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #48 from mitchashby16/fix_200_message_text 

    Fix 200 message text
    @dsshim
    dsshim committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    5f6979a View commit details
    Browse the repository at this point in the history

  41. small refactorings

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    2be2aec View commit details
    Browse the repository at this point in the history

  42. removed unneeded spaces

    @noobjey
    noobjey committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    23bba07 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #49 from mitchashby16/tests_and_test 

    feature tests for app data and sources
    @mitcha16
    mitcha16 committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    72a8a59 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2015

  1. work in progess url statistics

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    8cb919d View commit details
    Browse the repository at this point in the history

  2. fixed merge conflicts

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    495d60b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50 from mitchashby16/tests 

    work in progess url statistics
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    cb64596 View commit details
    Browse the repository at this point in the history

  4. removed unused code

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    cf0804e View commit details
    Browse the repository at this point in the history

  5. made feature tests clean database between each test

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    509d6af View commit details
    Browse the repository at this point in the history

  6. added events page, no stats yet

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    dcff927 View commit details
    Browse the repository at this point in the history

  7. fixed merge conflicts

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    95247d5 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #51 from mitchashby16/events 

    Events
    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    b9db88e View commit details
    Browse the repository at this point in the history

  9. fixing merge

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    7c06c1b View commit details
    Browse the repository at this point in the history

  10. fixing merge

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    ac150f5 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #52 from mitchashby16/finishing_url_statistics 

    Finishing url statistics
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    8054f3f View commit details
    Browse the repository at this point in the history

  12. css, views and refactored app data

    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    4238977 View commit details
    Browse the repository at this point in the history

  13. merge conflicts resolved

    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    5fcd8ba View commit details
    Browse the repository at this point in the history

  14. refactored app stats and css

    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    8bcdf69 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #53 from mitchashby16/css 

    Css closes #53
    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    8143907 View commit details
    Browse the repository at this point in the history

  16. users can click on an event to goto its details

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    cce6b5d View commit details
    Browse the repository at this point in the history

  17. fixed urls and events table

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    6ae6129 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #54 from mitchashby16/finishing_url_statistics 

    fixed urls and events table
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    dbb95f0 View commit details
    Browse the repository at this point in the history

  19. fixed registration

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    84b5511 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #55 from mitchashby16/finishing_url_statistics 

    fixed registration
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    9777def View commit details
    Browse the repository at this point in the history

  21. controller test for events

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    1b2ca30 View commit details
    Browse the repository at this point in the history

  22. fixed tests after db changes

    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    7bb6e05 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #56 from mitchashby16/fixed_tests 

    fixed tests after db changes
    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    9935189 View commit details
    Browse the repository at this point in the history

  24. finished calculator test

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    474523e View commit details
    Browse the repository at this point in the history

  25. feature tests for urls

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    9ffefd1 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #57 from mitchashby16/final_url_stats 

    finished calculator test
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    6bc746d View commit details
    Browse the repository at this point in the history

  27. displays message when no events

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    ee48835 View commit details
    Browse the repository at this point in the history

  28. fixed bug with not storing everything to same table row

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    86999aa View commit details
    Browse the repository at this point in the history

  29. Merge pull request #58 from mitchashby16/payload_storage_fixed 

    fixed bug with not storing everything to same table row
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    789e2a5 View commit details
    Browse the repository at this point in the history

  30. fixed repeat links

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    3d77815 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #59 from mitchashby16/final_url_stats 

    fixed repeat links
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    a3ff55f View commit details
    Browse the repository at this point in the history

  32. Merge branch 'master' into events

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    c70eba4 View commit details
    Browse the repository at this point in the history

  33. all tests working

    @mitcha16
    mitcha16 committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    a2f34b2 View commit details
    Browse the repository at this point in the history

  34. fixed bug with events lookup and creation of events for tests

    @noobjey
    noobjey committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    e37eac9 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #60 from mitchashby16/most_user_events 

    all tests working
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    53e9ced View commit details
    Browse the repository at this point in the history

  36. Merge pull request #61 from mitchashby16/events 

    Events
    @dsshim
    dsshim committed Jul 19, 2015
    Configuration menu
    Copy the full SHA
    0ae580f View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. active record fix

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    df375ad View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from mitchashby16/active_record_methods_fix 

    active record fix closes #62
    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    44e7cae View commit details
    Browse the repository at this point in the history

  3. event showing with count and no event message working

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    6dee1c3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into event

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    ec5606e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #63 from mitchashby16/event 

    Event
    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    ed2cfe0 View commit details
    Browse the repository at this point in the history

  6. view event by hour

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    696867e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #64 from mitchashby16/event_by_time 

    view event by hour
    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    88ddd93 View commit details
    Browse the repository at this point in the history

  8. finished

    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    889b4f2 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #65 from mitchashby16/finishing 

    finished
    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    1d6a44f View commit details
    Browse the repository at this point in the history

  10. fixed tests

    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    9393048 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #66 from mitchashby16/finishing 

    fixed tests
    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    6ea5a63 View commit details
    Browse the repository at this point in the history

  12. remove uneeded test

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    94e7bdb View commit details
    Browse the repository at this point in the history

  13. added partial

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    8221016 View commit details
    Browse the repository at this point in the history

  14. event using partial

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    00c25f8 View commit details
    Browse the repository at this point in the history

  15. changed to match other styling

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    706db9c View commit details
    Browse the repository at this point in the history

  16. Merge pull request #67 from mitchashby16/events_partial 

    Events partial
    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    e344b8f View commit details
    Browse the repository at this point in the history

  17. final style

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    2a7788c View commit details
    Browse the repository at this point in the history

  18. final style

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    6fcb0f5 View commit details
    Browse the repository at this point in the history

  19. final styling

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    518de1c View commit details
    Browse the repository at this point in the history

  20. Merge pull request #68 from mitchashby16/final_style 

    Final style
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    300610b View commit details
    Browse the repository at this point in the history

  21. fixed line lenths above 80

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    329f014 View commit details
    Browse the repository at this point in the history

  22. partail for event

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    730905a View commit details
    Browse the repository at this point in the history

  23. final tests and css

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    61e2ee7 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #69 from mitchashby16/final_style 

    final tests and css
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    8a33503 View commit details
    Browse the repository at this point in the history

  25. partials

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    ddd7696 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #70 from mitchashby16/partials 

    partials
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    c5f81d2 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #71 from mitchashby16/fix_line_length 

    fixed line lenths above 80
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    d6224c3 View commit details
    Browse the repository at this point in the history

  28. event partial working

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    8fd5e13 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #72 from mitchashby16/event_partial 

    Event partial
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    c43e889 View commit details
    Browse the repository at this point in the history

  30. fixed tests final

    @dsshim
    dsshim committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    3744e73 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #73 from mitchashby16/fixed_tests 

    fixed tests final
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    97bfd43 View commit details
    Browse the repository at this point in the history

  32. pulled out shared test code

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    6bcf1dc View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' into refactor_test

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    c692a1a View commit details
    Browse the repository at this point in the history

  34. typo

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    d318152 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #74 from mitchashby16/refactor_test 

    Refactor test
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    9577d9f View commit details
    Browse the repository at this point in the history

  36. fixed bug with event not found message

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    f334a46 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'master' into event_view

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    b7b6fae View commit details
    Browse the repository at this point in the history

  38. Merge pull request #75 from mitchashby16/event_fix 

    Event fix
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    9edb96c View commit details
    Browse the repository at this point in the history

  39. took pry out of prod deploy

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    75fe907 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #76 from mitchashby16/gemfix 

    took pry out of prod deploy
    @mitcha16
    mitcha16 committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    0433238 View commit details
    Browse the repository at this point in the history

  41. line length

    @noobjey
    noobjey committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    accf496 View commit details
    Browse the repository at this point in the history