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

Conflictvisualizer api integration #119

Open
wants to merge 25 commits into
base: develop
Choose a base branch
from
Open

Conflictvisualizer api integration #119

wants to merge 25 commits into from

Commits on Sep 11, 2024

  1. Adding intersection tables to create sql

    @jacob6838
    jacob6838 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    a542fa3 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Adding intersection admin pages

    @jacob6838
    jacob6838 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    da54572 View commit details
    Browse the repository at this point in the history

  2. Final intersection admin logical touches

    @jacob6838
    jacob6838 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    75c5c73 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into Feature/intersection-tables

    @jacob6838
    jacob6838 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0e3a0dc View commit details
    Browse the repository at this point in the history

  4. Updating intersection unit tests

    @jacob6838
    jacob6838 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    06d3355 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge branch 'develop' into Feature/intersection-tables

    @jacob6838
    jacob6838 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    7a7be7e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Updating intersection unit tests

    @jacob6838
    jacob6838 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e166ee2 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Update CVManager_CreateTables.sql

    @jacob6838
    jacob6838 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    4152487 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Merge branch 'develop' into Feature/intersection-tables

    @jacob6838
    jacob6838 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b26f0f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Creating intersection api unit tests

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    cfdec82 View commit details
    Browse the repository at this point in the history

  2. Finalizing intersection api unit tests

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    83ba113 View commit details
    Browse the repository at this point in the history

  3. Create intersection_update.sql

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9b1ecf3 View commit details
    Browse the repository at this point in the history

  4. enabling editing of intersection ID

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    da1537f View commit details
    Browse the repository at this point in the history

  5. Update admin_intersection.py

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    3a89766 View commit details
    Browse the repository at this point in the history

  6. Update intersection_update.sql

    @jacob6838
    jacob6838 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    4ca8e66 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Adding conflictvisualizer api

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    897defe View commit details
    Browse the repository at this point in the history

  2. Adding conflictvisualizer submodules

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    7146da1 View commit details
    Browse the repository at this point in the history

  3. Updating docker compose for conflictvisualizer build

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    3e97671 View commit details
    Browse the repository at this point in the history

  4. merging updated conflictvisualizer changes

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    0baefac View commit details
    Browse the repository at this point in the history

  5. Tweaking conflictvisualizer api variables

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    7699f1f View commit details
    Browse the repository at this point in the history

  6. Tweaking conflictvisualizer api variables

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    a07ef98 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/Feature/intersection-tables' int… 

    …o conflictvisualizer-api-integration
    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    07efefd View commit details
    Browse the repository at this point in the history

  8. adding conflictvisualizer build comments

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    262229d View commit details
    Browse the repository at this point in the history

  9. Re-naming conflictvisualizer api to intersection api

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    556be05 View commit details
    Browse the repository at this point in the history

  10. Updates after renaming

    @jacob6838
    jacob6838 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    60ebf5a View commit details
    Browse the repository at this point in the history