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

Jl - ui for protocol merge #1721

Merged
merged 12 commits into from
Feb 20, 2019
Merged

Jl - ui for protocol merge #1721

merged 12 commits into from
Feb 20, 2019

Commits on Feb 7, 2019

  1. Initial commit for protocol merge tool.

    @jleonardw9
    jleonardw9 committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    ad09dce View commit details
    Browse the repository at this point in the history

  2. Adding text fields and initiate button.

    @jleonardw9
    jleonardw9 committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    d0fbe2f View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. Adding javascript.

    @jleonardw9
    jleonardw9 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    3064075 View commit details
    Browse the repository at this point in the history

  2. Adding in some validation.

    @jleonardw9
    jleonardw9 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    811417e View commit details
    Browse the repository at this point in the history

  3. Only catalog overlords can perform merges.

    @jleonardw9
    jleonardw9 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    a121c7b View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Adding and modifing merge code from rake task

    @jleonardw9
    jleonardw9 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    9e34c9e View commit details
    Browse the repository at this point in the history

  2. Creating merge srs service object.

    @jleonardw9
    jleonardw9 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    83eb5f9 View commit details
    Browse the repository at this point in the history

  3. Getting merge to work and adding calendar validation.

    @jleonardw9
    jleonardw9 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    8eb1df9 View commit details
    Browse the repository at this point in the history

  4. Clear the fields upon ajax success.

    @jleonardw9
    jleonardw9 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    d76c798 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Adding another service object.

    @jleonardw9
    jleonardw9 committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    ee24186 View commit details
    Browse the repository at this point in the history

  2. Fixing specs

    @jleonardw9
    jleonardw9 committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    c46463e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Fixing items noticed by the team.

    @jleonardw9
    jleonardw9 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    e42936d View commit details
    Browse the repository at this point in the history