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

Updating optaa-fix branch with recent changes from oo/asset-management #1211

Merged
merged 24 commits into from
Jul 13, 2023
Merged

Updating optaa-fix branch with recent changes from oo/asset-management #1211

merged 24 commits into from
Jul 13, 2023

Commits on May 24, 2023

  1. Merge pull request #1175 from WHOIGit/main 

    Updating gliders branch from updated WHOIGit main
    @snwhite
    snwhite authored May 24, 2023
    Configuration menu
    Copy the full SHA
    3838518 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge remote-tracking branch 'upstream/master'

    @kpolitano
    kpolitano committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    5d2344d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge pull request #1189 from WHOIGit/main 

    Updating gliders branch from updated WHOIGit main
    @snwhite
    snwhite authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    f941d7b View commit details
    Browse the repository at this point in the history

  2. SPKIR-B 

    Cal files for serviced instruments
    @kpolitano
    kpolitano committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    10daedd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1026 from kpolitano/SPKIR-B 

    Spkir b
    @desiderr
    desiderr authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b9f6529 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Update sensor_bulk_load-AssetRecord.csv 

    Adds new glider sensors being deployed at Irminger
    @cdobs
    cdobs committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    58c69f6 View commit details
    Browse the repository at this point in the history

  2. Removing CTDGVM-09687

    @cdobs
    cdobs committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    29dc839 View commit details
    Browse the repository at this point in the history

  3. Create CGINS-CTDGVM-09678__20200920.csv

    @cdobs
    cdobs committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    27e6fac View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Merge pull request #1195 from WHOIGit/cross-mio 

    Update sensor_bulk_load-AssetRecord.csv
    @snwhite
    snwhite authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    e870a57 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1197 from WHOIGit/optaa-fix 

    Optaa 218 fix
    @snwhite
    snwhite authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7310b31 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1198 from oceanobservatories/master 

    Updating WHOIGit asset-management main with latest changes from oceanobservatories master
    @snwhite
    snwhite authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    05f61cc View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. Merge pull request #1027 from WHOIGit/main 

    CGSN cross-mio and cal updates
    @snwhite
    snwhite authored Jul 1, 2023
    Configuration menu
    Copy the full SHA
    95d658c View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. + CE05 311-D16, 320-D&R12, 383-D&R16, & 384-D13

    @s-pearce
    s-pearce committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    e86e3ec View commit details
    Browse the repository at this point in the history

  2. New glider cals

    @cdobs
    cdobs committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    d51c3cb View commit details
    Browse the repository at this point in the history

  3. + DOSTA176_20230303, + D&R cruises, +CE05 1012-R1, 312-R14, & updated… 

    … 320-R12 & 383-R16
    @s-pearce
    s-pearce committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    730b90e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1028 from s-pearce/ce_glider 

    Ce glider
    @jwhitefield42
    jwhitefield42 authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ed515f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. CTDBP_cals

    MJ Zirbel committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    1cbcc13 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Merge pull request #1199 from WHOIGit/gliders 

    New glider cals
    @snwhite
    snwhite authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    9cb0ed7 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. OPTAA-J 

    Cal files for CSPP OPTAAs
    @kpolitano
    kpolitano committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    46402ea View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'master' into master

    @desiderr
    desiderr authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    0dea6fa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1029 from mjozirbel/master 

    OSU CTDBP cal files
    @desiderr
    desiderr authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    c66a6a4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into OPTAA-J

    @desiderr
    desiderr authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    dca0dc0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1030 from kpolitano/OPTAA-J 

    OPTAA-J
    @desiderr
    desiderr authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    1a6dfbc View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge pull request #1201 from oceanobservatories/master 

    Updating WHOIGit main from OO-am main
    @reedan88
    reedan88 authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    c7860fc View commit details
    Browse the repository at this point in the history