Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Scrumx #91

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

Scrumx #91

wants to merge 57 commits into from

Commits on Feb 19, 2021

  1. Deliverable 0 - Natural Disaster Prevention 

    Deliverable  0 contains updated proposal.
    @icyair100
    icyair100 committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    255bbf1 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. Nest in Folder 

    Deliverable 0
    @icyair100
    icyair100 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    5673de0 View commit details
    Browse the repository at this point in the history

  2. weather data

    @icyair100
    icyair100 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    abecd5d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from icyair100/AR_D1 

    weather data
    @icyair100
    icyair100 authored Feb 27, 2021
    Configuration menu
    Copy the full SHA
    40bcd55 View commit details
    Browse the repository at this point in the history

  4. THis is a test, ok?

    Simon Angel authored and Simon Angel committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    61d3989 View commit details
    Browse the repository at this point in the history

  5. Update README.md

    @varocarras
    varocarras committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    dd99838 View commit details
    Browse the repository at this point in the history

  6. Update README.md

    @varocarras
    varocarras committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    136c026 View commit details
    Browse the repository at this point in the history

  7. HeatMap/Transform Data 

    Transform weather data into heat map and choropleth map
    @icyair100
    icyair100 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    6426856 View commit details
    Browse the repository at this point in the history

  8. Fixed Chloropleth Map

    @icyair100
    icyair100 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    3b66eec View commit details
    Browse the repository at this point in the history

  9. HeatMap/Transform Data (#4) 

    * HeatMap/Transform Data

Transform weather data into heat map and choropleth map

* Fixed Chloropleth Map
    @icyair100
    icyair100 authored Feb 27, 2021
    Configuration menu
    Copy the full SHA
    d3dc2fb View commit details
    Browse the repository at this point in the history

  10. Added simplified list of Tornado locations 

    Created by Abdullah
    @varocarras
    varocarras committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    23a5e44 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Python script to get weather data from API 

    gathered data from API & stored in dataframe & csv
    @icyair100
    icyair100 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    3f75295 View commit details
    Browse the repository at this point in the history

  2. python notebook fix

    @icyair100
    icyair100 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    b34d00c View commit details
    Browse the repository at this point in the history

  3. Python script to get weather data from API (#6) 

    * HeatMap/Transform Data

Transform weather data into heat map and choropleth map

* Fixed Chloropleth Map

* Python script to get weather data from API

gathered data from API & stored in dataframe & csv

* python notebook fix
    @icyair100
    icyair100 authored Feb 28, 2021
    Configuration menu
    Copy the full SHA
    91d5102 View commit details
    Browse the repository at this point in the history

  4. Created README for Deliverable 1 

    Created Markdown version of Project proposal for easier future editing.
    @icyair100
    icyair100 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    4fcdd2a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2021

  1. Merge pull request #7 from icyair100/AR_D1 

    Created README for Deliverable 1
    @icyair100
    icyair100 authored Mar 1, 2021
    Configuration menu
    Copy the full SHA
    a26fc17 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Created .gitignore 

    Made a .gitignore file to include DS_Store
    @varocarras
    varocarras committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    079dba1 View commit details
    Browse the repository at this point in the history

  2. Update DS_Store 

    Ignore
    @varocarras
    varocarras committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    1f72142 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into AC_D1

    @varocarras
    varocarras committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    6c73643 View commit details
    Browse the repository at this point in the history

  4. Create .gitignore

    @icyair100
    icyair100 committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    da1b017 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8 from icyair100/AR_D1 

    Create .gitignore
    @icyair100
    icyair100 authored Mar 2, 2021
    Configuration menu
    Copy the full SHA
    3367a3d View commit details
    Browse the repository at this point in the history

  6. Remove unnecessary files 

    Removing historical_data
Removing historical_data2
Removing weather_data
    @varocarras
    varocarras committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    e800d93 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge pull request #9 from icyair100/AC_D1 

    Removing unnecessary files
    @varocarras
    varocarras authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    4cd2174 View commit details
    Browse the repository at this point in the history

  2. Update Project_Proposal_CS506.md

    @fhorn97
    fhorn97 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2d9ab0d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11 from icyair100/FH_D1 

    Updated Names in Project Proposal
    @fhorn97
    fhorn97 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    01d3870 View commit details
    Browse the repository at this point in the history

  4. Delete testFile

    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    fed0a69 View commit details
    Browse the repository at this point in the history

  5. Deliverable 1

    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    6e1fdd0 View commit details
    Browse the repository at this point in the history

  6. Checklist update

    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    40a272d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #15 from icyair100/Deliverable-1 

    Remove conflict files
    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    1c0f030 View commit details
    Browse the repository at this point in the history

  8. Delete .DS_Store

    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    d54fcf7 View commit details
    Browse the repository at this point in the history

  9. Delete .DS_Store

    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    4cbe51f View commit details
    Browse the repository at this point in the history

  10. Delete .DS_Store

    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    5365e15 View commit details
    Browse the repository at this point in the history

  11. Create README.md

    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    1859284 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'Deliverable-1' of https://github.com/icyair100/CS506Spr… 

    …ing2021Repository into Deliverable-1
    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f9e1eac View commit details
    Browse the repository at this point in the history

  13. Merge pull request #16 from icyair100/Deliverable-1 

    Fix Master Branch
    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    cce6127 View commit details
    Browse the repository at this point in the history

  14. Started Graphing Notebook

    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    6bbe68a View commit details
    Browse the repository at this point in the history

  15. Updated historical_data_fin fields

    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    5dbc012 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'AC_D1' of https://github.com/icyair100/CS506Spring2021R… 

    …epository into AC_D1
    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    809464f View commit details
    Browse the repository at this point in the history

  17. Created a Graphing Notebook 

    Added Graphing.ipynb to Deliverable 2.

Updated .gitignore for Deliverable 2
    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2bce8bc View commit details
    Browse the repository at this point in the history

  18. Update Graphing.ipynb 

    Added comments and extra lines on Median/Mean graphs
    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    c23a27c View commit details
    Browse the repository at this point in the history

  19. Delete .ipnyb checkpoints

    @varocarras
    varocarras committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    e5fb831 View commit details
    Browse the repository at this point in the history

  20. Delete .DS_Store

    @varocarras
    varocarras authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2c893f9 View commit details
    Browse the repository at this point in the history

  21. Delete .DS_Store

    @varocarras
    varocarras authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    186ea87 View commit details
    Browse the repository at this point in the history

  22. Delete .DS_Store

    @varocarras
    varocarras authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    9532952 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #17 from icyair100/AC_D1 

    Created a Graphing Notebook for Deliverable 2
    @varocarras
    varocarras authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    469bf5c View commit details
    Browse the repository at this point in the history

  24. updated proposal with my name

    @fhorn97
    fhorn97 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    9ee8f43 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #18 from icyair100/updateProposal 

    updated proposal with my name
    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    d2179ef View commit details
    Browse the repository at this point in the history

  26. Update Graphing.ipynb

    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f819fcb View commit details
    Browse the repository at this point in the history

  27. Update Graphing.ipynb

    @icyair100
    icyair100 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    faf1496 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #19 from icyair100/AR_D1 

    Update Graphing.ipynb
    @icyair100
    icyair100 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    1d22c0a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Create scrum_1.md

    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    5b75f8b View commit details
    Browse the repository at this point in the history

  2. merge conflicts

    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    9234d3b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into scrumx

    @icyair100
    icyair100 authored Mar 24, 2021
    Configuration menu
    Copy the full SHA
    07f0ded View commit details
    Browse the repository at this point in the history

  4. Revert "merge conflicts" 

    This reverts commit 9234d3b.
    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    c605a99 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'scrumx' of https://github.com/icyair100/CS506Spring2021… 

    …Repository into scrumx
    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    8c049f9 View commit details
    Browse the repository at this point in the history

  6. Revert "Merge branch 'scrumx' of https://github.com/icyair100/CS506Sp… 

    …ring2021Repository into scrumx"

This reverts commit 8c049f9, reversing
changes made to c605a99.
    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    62d6091 View commit details
    Browse the repository at this point in the history

  7. merge conflict

    @icyair100
    icyair100 committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    21c6259 View commit details
    Browse the repository at this point in the history