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

Jianj branch #449

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open

Jianj branch #449

wants to merge 38 commits into from

Commits on Oct 19, 2022

  1. Update 1

    @okennedyumd
    okennedyumd committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    88011ca View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Update index.html

    @Jianjoobeen
    Jianjoobeen committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    57977af View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. smithsonian api and my api request

    @okennedyumd
    okennedyumd committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    8f0a1bc View commit details
    Browse the repository at this point in the history

  2. main

    @okennedyumd
    okennedyumd committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    d7ed54d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from okennedyumd/owenK 

    Pull request
    @okennedyumd
    okennedyumd authored Nov 17, 2022
    Configuration menu
    Copy the full SHA
    3e86eb4 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Added Css from lab some javeScript and HTML

    @okennedyumd
    okennedyumd committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    e0a4c4f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from okennedyumd/owenK 

    Added Css from lab some javeScript and HTML
    @okennedyumd
    okennedyumd authored Nov 30, 2022
    Configuration menu
    Copy the full SHA
    6f1fa25 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. Index page set up

    @okennedyumd
    okennedyumd committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    be527ad View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from okennedyumd/owenK 

    Index page set up
    @okennedyumd
    okennedyumd authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    96d33e7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into jianj_branch

    @jianj65
    jianj65 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    4dc1f67 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from okennedyumd/jianj_branch 

    Update index.html
    @jianj65
    jianj65 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    1365fb9 View commit details
    Browse the repository at this point in the history

  5. Revert "Update index.html"

    @jianj65
    jianj65 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    f3373bb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from okennedyumd/revert-1-jianj_branch 

    Revert "Update index.html"
    @jianj65
    jianj65 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    fe9a787 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. secondpage

    @Jianjoobeen
    Jianjoobeen committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    dd5134c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from okennedyumd/jianj_branch 

    secondpage
    @jianj65
    jianj65 authored Dec 2, 2022
    Configuration menu
    Copy the full SHA
    2dadadd View commit details
    Browse the repository at this point in the history

  3. Update index.html

    @Jianjoobeen
    Jianjoobeen committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    f161e98 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7 from okennedyumd/jianj_branch 

    Update index.html
    @jianj65
    jianj65 authored Dec 2, 2022
    Configuration menu
    Copy the full SHA
    210dfef View commit details
    Browse the repository at this point in the history

  5. pages

    @okennedyumd
    okennedyumd committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    d958914 View commit details
    Browse the repository at this point in the history

  6. Working on map and search

    @okennedyumd
    okennedyumd committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    b1a266b View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. Did some work on adding the map and api

    @okennedyumd
    okennedyumd committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    b359735 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from okennedyumd/owenK 

    Adding map and api
    @okennedyumd
    okennedyumd authored Dec 3, 2022
    Configuration menu
    Copy the full SHA
    cd8dcfd View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. map changes

    @Jianjoobeen
    Jianjoobeen committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    e567fcb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from okennedyumd/jianj_branch 

    map changes
    @jianj65
    jianj65 authored Dec 9, 2022
    Configuration menu
    Copy the full SHA
    430fe19 View commit details
    Browse the repository at this point in the history

  3. chartjs

    @Jianjoobeen
    Jianjoobeen committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    e3cb6f7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #10 from okennedyumd/jianj_branch 

    chartjs
    @jianj65
    jianj65 authored Dec 9, 2022
    Configuration menu
    Copy the full SHA
    e53238d View commit details
    Browse the repository at this point in the history

  5. apiRoutes

    @okennedyumd
    okennedyumd committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    a157791 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. small changes

    @okennedyumd
    okennedyumd committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    b587b42 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/okennedyumd/Fresh4-Final-Pr… 

    …oject-Smithsonian into owenK
    @okennedyumd
    okennedyumd committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    a0e6363 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. spelling

    @okennedyumd
    okennedyumd committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    964136d View commit details
    Browse the repository at this point in the history

  2. removed lds

    @okennedyumd
    okennedyumd committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    a1dbccb View commit details
    Browse the repository at this point in the history

  3. removed lds

    @okennedyumd
    okennedyumd committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    23ce5fd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from okennedyumd/owenK 

    lds removed
    @okennedyumd
    okennedyumd authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    83a15b4 View commit details
    Browse the repository at this point in the history

  5. fixed up html and api

    @okennedyumd
    okennedyumd committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    2dd100b View commit details
    Browse the repository at this point in the history

  6. html

    @okennedyumd
    okennedyumd committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    2ba524e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #12 from okennedyumd/owenK 

    Owen k
    @okennedyumd
    okennedyumd authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    5549457 View commit details
    Browse the repository at this point in the history

  8. Update script.js

    @Jianjoobeen
    Jianjoobeen committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    59ceeb5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/okennedyumd/Fresh4-Final-Pr… 

    …oject-Smithsonian into jianj_branch
    @Jianjoobeen
    Jianjoobeen committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    7253013 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. chart

    @Jianjoobeen
    Jianjoobeen committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    1828bfe View commit details
    Browse the repository at this point in the history