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

Sync frontend team with latest from master #222

Merged
merged 80 commits into from
Mar 27, 2020
Merged

Sync frontend team with latest from master #222

merged 80 commits into from
Mar 27, 2020

Commits on Mar 11, 2020

  1. testing nesting the current test scripts in a travis matrix

    @ab7289
    ab7289 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    8ff6b37 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. merged changes from master

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    1d4b173 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'travis-test-sync' into travis-test

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    fa53935 View commit details
    Browse the repository at this point in the history

  3. adding job separator

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    e380ca6 View commit details
    Browse the repository at this point in the history

  4. adding travis defaults to fix build config warnings

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    74aee1c View commit details
    Browse the repository at this point in the history

  5. created basic raspbian based Dockerfile and updated the hardware buil… 

    …d to try to run a simple test
    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    a7c7f93 View commit details
    Browse the repository at this point in the history

  6. fixed .travis.yml formatting errors

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    689e8c9 View commit details
    Browse the repository at this point in the history

  7. fixed misspelling when preparing qemu

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    885afd6 View commit details
    Browse the repository at this point in the history

  8. modified the before_script

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    6e3d596 View commit details
    Browse the repository at this point in the history

  9. added some basic logging statements to see if docker container is sta… 

    …rting up
    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    c0b94fa View commit details
    Browse the repository at this point in the history

  10. updated script to try to get docker image to run

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    d28654f View commit details
    Browse the repository at this point in the history

  11. added check to see if container ran the command

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    aad23e2 View commit details
    Browse the repository at this point in the history

  12. modified the script portion to see if the build will finish successfu… 

    …lly or stay alive indefinitely
    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    762f405 View commit details
    Browse the repository at this point in the history

  13. seeing if the -rm flag is the issue

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    7892f07 View commit details
    Browse the repository at this point in the history

  14. removed docker ps call as it seems like that was keeping the containe… 

    …r alive
    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    00f6b07 View commit details
    Browse the repository at this point in the history

  15. removed docker info phrase

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    03de6d8 View commit details
    Browse the repository at this point in the history

  16. modified test

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    526f4ac View commit details
    Browse the repository at this point in the history

  17. removed extraneous test steps

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    940e37a View commit details
    Browse the repository at this point in the history

  18. added some comments and cleaned up spacing

    @ab7289
    ab7289 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    b4cf91c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. updated Dockerfile to use a more up to date base image

    @ab7289
    ab7289 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    cbb2f9f View commit details
    Browse the repository at this point in the history

  2. installed raspi-config dependency

    @ab7289
    ab7289 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8e0ff17 View commit details
    Browse the repository at this point in the history

  3. added run script

    @ab7289
    ab7289 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f92f350 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Added environment var file

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    8969f04 View commit details
    Browse the repository at this point in the history

  2. Added logger module

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    e828933 View commit details
    Browse the repository at this point in the history

  3. Added utils

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    2389f02 View commit details
    Browse the repository at this point in the history

  4. Using logger in serial write

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    97b33d7 View commit details
    Browse the repository at this point in the history

  5. clean up

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    e7f30b4 View commit details
    Browse the repository at this point in the history

  6. Added logger to serial read

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    20b33e7 View commit details
    Browse the repository at this point in the history

  7. Fixed code formatting issues

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    722bc4f View commit details
    Browse the repository at this point in the history

  8. Fixed env var name

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    82d62da View commit details
    Browse the repository at this point in the history

  9. fixed serial read logging

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    f2ebb60 View commit details
    Browse the repository at this point in the history

  10. clean up

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    22e30e9 View commit details
    Browse the repository at this point in the history

  11. replaced print with logging

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    7884e75 View commit details
    Browse the repository at this point in the history

  12. Fixed code formatting issues

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    c013270 View commit details
    Browse the repository at this point in the history

  13. Added README instructions

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    bcc54b1 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #125 from gcivil-nyu-org/travis-test 

    Add secondary build job for hardware testing
    @ab7289
    ab7289 committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    2e368ed View commit details
    Browse the repository at this point in the history

  15. merged master and resolved conflicts

    @ab7289
    ab7289 committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    bd26feb View commit details
    Browse the repository at this point in the history

  16. updated travis

    @ab7289
    ab7289 committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    3935611 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Merge pull request #136 from gcivil-nyu-org/feat/logger-env 

    Added Logger and environment variables
    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    e3fc25e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #138 from gcivil-nyu-org/sync-master 

    Sync hardware team with master
    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    a78be70 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Added lan_client

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    5055604 View commit details
    Browse the repository at this point in the history

  2. Renamed and fixed minor issue

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    a5c99e3 View commit details
    Browse the repository at this point in the history

  3. Renamed lan server

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    9495901 View commit details
    Browse the repository at this point in the history

  4. updated logging

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    ed7f440 View commit details
    Browse the repository at this point in the history

  5. minor fix

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    179e7a4 View commit details
    Browse the repository at this point in the history

  6. added logging in file

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    8b5e623 View commit details
    Browse the repository at this point in the history

  7. Added more info to README

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    64a1b14 View commit details
    Browse the repository at this point in the history

  8. Added lan server port to env

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    5055402 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #140 from gcivil-nyu-org/hardware-team 

    Hardware team - Update Travis Build and add logging
    @MichaelLally
    MichaelLally committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    7f5f5e3 View commit details
    Browse the repository at this point in the history

  10. added .coveragerc file to control pythong coverage, added initial tests

    @ab7289
    ab7289 committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    32baa01 View commit details
    Browse the repository at this point in the history

  11. added .coveragerc file to control coverage

    @ab7289
    ab7289 committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    3589751 View commit details
    Browse the repository at this point in the history

  12. fixed black violation

    @ab7289
    ab7289 committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    8f4428e View commit details
    Browse the repository at this point in the history

  13. removed .coveragerc as we need different run parameters depending on … 

    …whether we're running against django or hardware
    @ab7289
    ab7289 committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    b0ba5a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge pull request #146 from gcivil-nyu-org/feat/logger-env 

    Added LAN client and logging to LAN Server
    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    ee4a3fe View commit details
    Browse the repository at this point in the history

  2. modified Dockerfile and travis build

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    d22ea21 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/hardware-team' into feature/hard… 

    …ware-tests
    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    4771dbd View commit details
    Browse the repository at this point in the history

  4. reverted coveragerc deletion

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    260532a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'test-revert' into feature/hardware-tests

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    849f146 View commit details
    Browse the repository at this point in the history

  6. added tests for CommunicationsPi.is_serial_usb

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    c6f3f8c View commit details
    Browse the repository at this point in the history

  7. modified travis config to utilize config files instead of passing in … 

    …parameters
    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    c6754f4 View commit details
    Browse the repository at this point in the history

  8. updated check.sh since we no longer need to pass in flags

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    48cd564 View commit details
    Browse the repository at this point in the history

  9. added tests for extra_info and get_port in CommunicationsPi

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    dccc0bf View commit details
    Browse the repository at this point in the history

  10. fixed black violations

    @ab7289
    ab7289 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    2fa674c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Merge branch 'lint-config' into feature/hardware-tests

    @ab7289
    ab7289 committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    c584cce View commit details
    Browse the repository at this point in the history

  2. fixed flake8 violations

    @ab7289
    ab7289 committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    5bc9027 View commit details
    Browse the repository at this point in the history

  3. fixed black violations

    @ab7289
    ab7289 committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    ce23b28 View commit details
    Browse the repository at this point in the history

  4. clean up

    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    3d0c138 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/feature/hardware-tests' into fea… 

    …ture/hardware-tests
    @ab7289
    ab7289 committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    ce86d5a View commit details
    Browse the repository at this point in the history

  6. added explanatory comments

    @ab7289
    ab7289 committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    fe32cf5 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. updated test-requirements.txt to add testfixtures module and added so… 

    …me logger tests
    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    9700f88 View commit details
    Browse the repository at this point in the history

  2. fixed black violations

    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    cf02f26 View commit details
    Browse the repository at this point in the history

  3. added basic tests for logger public methods and removed debug print s… 

    …tatements in get_port
    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    2b1b8c8 View commit details
    Browse the repository at this point in the history

  4. updated flake8 line length to the django-recommended 119

    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    da21fd9 View commit details
    Browse the repository at this point in the history

  5. added CommunicationsPi.utils tests and fixed a line in utils

    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    15acf81 View commit details
    Browse the repository at this point in the history

  6. commented out lines not in use

    @ab7289
    ab7289 committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    5b12f0b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Merge pull request #149 from gcivil-nyu-org/feature/hardware-tests 

    Feature/hardware tests
    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    f87078f View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Merge pull request #155 from gcivil-nyu-org/sync-master-hardware 

    Sync `hardware-team` with `master`
    @PrabhanshuAttri
    PrabhanshuAttri committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    b61f6d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Merge pull request #154 from gcivil-nyu-org/hardware-team 

    Hardware team - Expand LAN Functionality and add automated testing
    @ab7289
    ab7289 committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    432dfd1 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Get grafana in sync with master, preparing to merge frontend to master. 

    Merge branch 'master' into grafana
    @daisycrego
    daisycrego committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    0acf88a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frontend-team' into grafana

    @daisycrego
    daisycrego committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    81bb7a2 View commit details
    Browse the repository at this point in the history