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.

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

Final merges completed #22

Closed
wants to merge 120 commits into from
Closed

Final merges completed #22

wants to merge 120 commits into from

Commits on May 6, 2020

  1. Configuration menu
    Copy the full SHA
    9bec3a6 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Configuration menu
    Copy the full SHA
    4420fdc View commit details
    Browse the repository at this point in the history
  2. Changed some styling to display routeTimeDiff next to routeText (disp…

    …lay: flex for .RouteCircle)
    ajlee12 committed May 7, 2020
    Configuration menu
    Copy the full SHA
    cb2b7a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    81106df View commit details
    Browse the repository at this point in the history
  4. Commented out two cnsl.logs in SvcOverview; adding cnsl.logs in route…

    …-trace. Tested taht 3-pt route displays time difference data.
    ajlee12 committed May 7, 2020
    Configuration menu
    Copy the full SHA
    b8b3627 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    46998d5 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. revamp2

    alon25 committed May 8, 2020
    Configuration menu
    Copy the full SHA
    98b491d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2e7a23f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0925717 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9c9eca6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5305df5 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. Re-render latency chart

    Umius-Brian committed May 9, 2020
    Configuration menu
    Copy the full SHA
    77a74a6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    58a0a7d View commit details
    Browse the repository at this point in the history
  3. Rendered avg-time data in 3 categories (avgTime, totalTime, #of trips…

    …) inside a scroll-box. Tweaked some styling.
    ajlee12 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    c956931 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2a07ebe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    56fc2a6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a18d1a7 View commit details
    Browse the repository at this point in the history
  7. Modularization

    alon25 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    bcf891b View commit details
    Browse the repository at this point in the history
  8. user settings json updated.

    ajlee12 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    d26f5f0 View commit details
    Browse the repository at this point in the history
  9. Toggle Services

    alon25 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    c60b251 View commit details
    Browse the repository at this point in the history
  10. setup ADD DELETE

    alon25 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    1fdb96e View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. Split CSS

    alon25 committed May 10, 2020
    Configuration menu
    Copy the full SHA
    370928e View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Split Stylesheets

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    61957a2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e234320 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'time-stamp'

    ajlee12 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    fbcd90e View commit details
    Browse the repository at this point in the history
  4. Managing App State

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    8f37578 View commit details
    Browse the repository at this point in the history
  5. Fixed MS buttons

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    47c2ff4 View commit details
    Browse the repository at this point in the history
  6. Fixed Window Size

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    ab5028e View commit details
    Browse the repository at this point in the history
  7. Graphs

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    a277819 View commit details
    Browse the repository at this point in the history
  8. Fixed Add Service Rendering

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    d0a998e View commit details
    Browse the repository at this point in the history
  9. Before First Merge

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b7b1773 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1 from ajlee12/master

    Merging in "time-stamp" feature to org's staging
    ajlee12 authored May 11, 2020
    Configuration menu
    Copy the full SHA
    8490097 View commit details
    Browse the repository at this point in the history
  11. Merged into master

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    9b269c5 View commit details
    Browse the repository at this point in the history
  12. Merged Route Details

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    7fd86b6 View commit details
    Browse the repository at this point in the history
  13. Stylesheets

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    1540fb1 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #3 from alon25/master

    Component Restructure
    ajlee12 authored May 11, 2020
    Configuration menu
    Copy the full SHA
    eaacfe9 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    0178998 View commit details
    Browse the repository at this point in the history
  16. First merge

    Umius-Brian committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b5823c5 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #4 from Umius-Brian/graph1

    Graph1
    Umius-Brian authored May 11, 2020
    Configuration menu
    Copy the full SHA
    4b23a2c View commit details
    Browse the repository at this point in the history
  18. master first merged

    alon25 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    295c6f3 View commit details
    Browse the repository at this point in the history
  19. changes in user/settings

    Brianna Sookhoo authored and Brianna Sookhoo committed May 11, 2020
    Configuration menu
    Copy the full SHA
    1f9b285 View commit details
    Browse the repository at this point in the history
  20. merge

    Brianna Sookhoo authored and Brianna Sookhoo committed May 11, 2020
    Configuration menu
    Copy the full SHA
    6af0ee6 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    fc910fa View commit details
    Browse the repository at this point in the history
  22. merged in new layout

    Brianna Sookhoo authored and Brianna Sookhoo committed May 11, 2020
    Configuration menu
    Copy the full SHA
    4fd9ccb View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Styling changes

    alon25 committed May 12, 2020
    Configuration menu
    Copy the full SHA
    46b0dcc View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6 from alon25/staging

    Staging
    alon25 authored May 12, 2020
    Configuration menu
    Copy the full SHA
    477f08d View commit details
    Browse the repository at this point in the history
  3. merge

    Brianna Sookhoo authored and Brianna Sookhoo committed May 12, 2020
    Configuration menu
    Copy the full SHA
    1e4127b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ad5575c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e178d10 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    207f957 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d538a64 View commit details
    Browse the repository at this point in the history
  8. Before style update

    alon25 committed May 12, 2020
    Configuration menu
    Copy the full SHA
    9ce8003 View commit details
    Browse the repository at this point in the history
  9. UI overhaul

    Umius-Brian committed May 12, 2020
    Configuration menu
    Copy the full SHA
    6991753 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #7 from Umius-Brian/graph1

    Graph1
    Umius-Brian authored May 12, 2020
    Configuration menu
    Copy the full SHA
    f239c91 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c99156f View commit details
    Browse the repository at this point in the history
  12. Updated tech colors

    Umius-Brian committed May 12, 2020
    Configuration menu
    Copy the full SHA
    5af6044 View commit details
    Browse the repository at this point in the history
  13. Styling Updates

    alon25 committed May 12, 2020
    Configuration menu
    Copy the full SHA
    06d7c79 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. styling before merge

    alon25 committed May 13, 2020
    Configuration menu
    Copy the full SHA
    abc50da View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8 from Umius-Brian/graph1

    Graph1
    Umius-Brian authored May 13, 2020
    Configuration menu
    Copy the full SHA
    29dd8a0 View commit details
    Browse the repository at this point in the history
  3. Styling Merged

    alon25 committed May 13, 2020
    Configuration menu
    Copy the full SHA
    06d0251 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #9 from alon25/staging

    Staging
    alon25 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    03d9e60 View commit details
    Browse the repository at this point in the history
  5. Style

    alon25 committed May 13, 2020
    Configuration menu
    Copy the full SHA
    066669b View commit details
    Browse the repository at this point in the history
  6. Merge pull request #10 from alon25/staging

    Style
    alon25 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    f44452f View commit details
    Browse the repository at this point in the history
  7. new graphs

    Brianna Sookhoo authored and Brianna Sookhoo committed May 13, 2020
    Configuration menu
    Copy the full SHA
    fbd599b View commit details
    Browse the repository at this point in the history
  8. merged new graph format

    Brianna Sookhoo authored and Brianna Sookhoo committed May 13, 2020
    Configuration menu
    Copy the full SHA
    3f67898 View commit details
    Browse the repository at this point in the history
  9. rendering node circles d3

    Brianna Sookhoo authored and Brianna Sookhoo committed May 13, 2020
    Configuration menu
    Copy the full SHA
    5ce8b93 View commit details
    Browse the repository at this point in the history
  10. rendering circles

    Brianna Sookhoo authored and Brianna Sookhoo committed May 13, 2020
    Configuration menu
    Copy the full SHA
    0a26d81 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    677b561 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    28ad2d5 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. some force simulation added

    Brianna Sookhoo authored and Brianna Sookhoo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    7a6ff33 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #12 from briannasookhoo/routesd3

    some force simulation added
    briannasookhoo authored May 14, 2020
    Configuration menu
    Copy the full SHA
    a635394 View commit details
    Browse the repository at this point in the history
  3. D3 Implementation

    Umius-Brian committed May 14, 2020
    Configuration menu
    Copy the full SHA
    3e72539 View commit details
    Browse the repository at this point in the history
  4. D3 Implementation

    Umius-Brian committed May 14, 2020
    Configuration menu
    Copy the full SHA
    dcbbc87 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3c63141 View commit details
    Browse the repository at this point in the history
  6. Move text closer to nodes

    Umius-Brian committed May 14, 2020
    Configuration menu
    Copy the full SHA
    8f48fc7 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #13 from Umius-Brian/MVP-Features

    MVP Features
    Umius-Brian authored May 14, 2020
    Configuration menu
    Copy the full SHA
    9394f61 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    47c6edf View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    23b251d View commit details
    Browse the repository at this point in the history
  10. rendering labels with nodes

    Brianna Sookhoo authored and Brianna Sookhoo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    702bd92 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    07ceaac View commit details
    Browse the repository at this point in the history
  12. Merge pull request #14 from briannasookhoo/routesd3

    rendering labels with nodes
    Umius-Brian authored May 14, 2020
    Configuration menu
    Copy the full SHA
    768d174 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    6ef8b9b View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b40dce7 View commit details
    Browse the repository at this point in the history
  15. getting link errors

    Brianna Sookhoo authored and Brianna Sookhoo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    0d57987 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    e7f2488 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    230856e View commit details
    Browse the repository at this point in the history
  18. Merge branch 'docker-stats'

    ajlee12 committed May 14, 2020
    Configuration menu
    Copy the full SHA
    52722d5 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    03cf112 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    7d46770 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #16 from ajlee12/master

    Combining docker-stats feature into latest UI revamp (before presentation)
    Umius-Brian authored May 14, 2020
    Configuration menu
    Copy the full SHA
    8b58d65 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    43e013f View commit details
    Browse the repository at this point in the history
  23. rendering links

    Brianna Sookhoo authored and Brianna Sookhoo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    7e9d182 View commit details
    Browse the repository at this point in the history
  24. merged docker stats

    Brianna Sookhoo authored and Brianna Sookhoo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    ee4a9f9 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    df620b3 View commit details
    Browse the repository at this point in the history
  26. Add json file

    Umius-Brian committed May 14, 2020
    Configuration menu
    Copy the full SHA
    39c59a3 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    3fe4baf View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    8b19c1e View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    beae2ca View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. Configuration menu
    Copy the full SHA
    f876cd7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #19 from Umius-Brian/MVP-Features

    Add TravisCI for testing and deployment
    Umius-Brian authored May 16, 2020
    Configuration menu
    Copy the full SHA
    1cb2025 View commit details
    Browse the repository at this point in the history
  3. Fix yaml file

    Umius-Brian committed May 16, 2020
    Configuration menu
    Copy the full SHA
    65f34da View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eb623ec View commit details
    Browse the repository at this point in the history
  5. Delete routes component

    Umius-Brian committed May 16, 2020
    Configuration menu
    Copy the full SHA
    85f1193 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #21 from Umius-Brian/MVP-Features

    MVP Features
    Umius-Brian authored May 16, 2020
    Configuration menu
    Copy the full SHA
    961c920 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7da51e4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    316633b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c3a6349 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #22 from Umius-Brian/Stretch-Features

    Stretch Features (added travis.yaml)
    ajlee12 authored May 16, 2020
    Configuration menu
    Copy the full SHA
    7d2de3a View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. Fixed bug where app crashes when selected svc has no docker data. If …

    …no docker data, box will display alert to user.
    ajlee12 committed May 17, 2020
    Configuration menu
    Copy the full SHA
    1dcd580 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #23 from ajlee12/master

    Fixed bug where app crashes when selected svc has no docker data. If …
    Umius-Brian authored May 17, 2020
    Configuration menu
    Copy the full SHA
    02c6d35 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Configuration menu
    Copy the full SHA
    2990c6e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a4a71c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f70e23c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a317511 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #24 from Umius-Brian/Stretch-Features

    Added some headers and tweaked font
    ajlee12 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    74d5e9d View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Remove excess files

    Umius-Brian committed May 28, 2020
    Configuration menu
    Copy the full SHA
    00f4306 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f7c616 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    223bd7b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f68161e View commit details
    Browse the repository at this point in the history
  5. Merge pull request #29 from Umius-Brian/Launch

    Nice work on fixing docker stats component sizing issue and cleaning up front-end file struct.!
    ajlee12 authored May 28, 2020
    Configuration menu
    Copy the full SHA
    85af74e View commit details
    Browse the repository at this point in the history